diff --git a/packages/types/src/estimate.d.ts b/packages/types/src/estimate.d.ts
index c2cd2d766..f25b99c56 100644
--- a/packages/types/src/estimate.d.ts
+++ b/packages/types/src/estimate.d.ts
@@ -31,13 +31,11 @@ export interface IEstimate {
 }
 
 export interface IEstimateFormData {
-  estimate: {
-    name: string;
-    description: string;
+  estimate?: {
     type: string;
   };
   estimate_points: {
-    id?: string;
+    id?: string | undefined;
     key: number;
     value: string;
   }[];
diff --git a/packages/ui/package.json b/packages/ui/package.json
index ca8275b40..26696e4b7 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -29,7 +29,7 @@
     "react-color": "^2.19.3",
     "react-dom": "^18.2.0",
     "react-popper": "^2.3.0",
-    "sonner": "^1.4.2",
+    "sonner": "^1.4.41",
     "tailwind-merge": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/ui/src/radio-input/radio-input.tsx b/packages/ui/src/radio-input/radio-input.tsx
index 87666a7c1..823bc1079 100644
--- a/packages/ui/src/radio-input/radio-input.tsx
+++ b/packages/ui/src/radio-input/radio-input.tsx
@@ -14,7 +14,7 @@ type RadioInputProps = {
   className?: string;
 };
 
-const RadioInput = ({
+export const RadioInput = ({
   label: inputLabel,
   labelClassName: inputLabelClassName,
   options,
@@ -63,4 +63,4 @@ const RadioInput = ({
   );
 };
 
-export { RadioInput };
+export default RadioInput;
diff --git a/packages/ui/src/sortable/sortable.tsx b/packages/ui/src/sortable/sortable.tsx
index 145908e79..e8d2ae503 100644
--- a/packages/ui/src/sortable/sortable.tsx
+++ b/packages/ui/src/sortable/sortable.tsx
@@ -21,7 +21,7 @@ const moveItems = <T,>(data: T[], source: T, destination: T): T[] => {
   return newData;
 };
 
-const Sortable = <T,>({ data, render, onChange, keyExtractor }: Props<T>) => {
+export const Sortable = <T,>({ data, render, onChange, keyExtractor }: Props<T>) => {
   useEffect(() => {
     const unsubscribe = monitorForElements({
       onDrop({ source, location }) {
@@ -46,4 +46,4 @@ const Sortable = <T,>({ data, render, onChange, keyExtractor }: Props<T>) => {
   );
 };
 
-export { Sortable };
+export default Sortable;
diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx
index 97927d216..d592db802 100644
--- a/web/components/core/activity.tsx
+++ b/web/components/core/activity.tsx
@@ -24,7 +24,10 @@ import { Tooltip, BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon }
 // helpers
 import { renderFormattedDate } from "@/helpers/date-time.helper";
 import { capitalizeFirstLetter } from "@/helpers/string.helper";
-import { useEstimate, useLabel } from "@/hooks/store";
+import {
+  // useEstimate,
+  useLabel,
+} from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // types
 
@@ -97,21 +100,21 @@ const LabelPill = observer(({ labelId, workspaceSlug }: { labelId: string; works
   );
 });
 
-const EstimatePoint = observer((props: { point: string }) => {
-  const { point } = props;
-  const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();
-  const currentPoint = Number(point) + 1;
+// const EstimatePoint = observer((props: { point: string }) => {
+//   const { point } = props;
+//   const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();
+//   const currentPoint = Number(point) + 1;
 
-  const estimateValue = getEstimatePointValue(Number(point), null);
+//   const estimateValue = getEstimatePointValue(Number(point), null);
 
-  return (
-    <span className="font-medium text-custom-text-100 whitespace-nowrap">
-      {areEstimatesEnabledForCurrentProject
-        ? estimateValue
-        : `${currentPoint} ${currentPoint > 1 ? "points" : "point"}`}
-    </span>
-  );
-});
+//   return (
+//     <span className="font-medium text-custom-text-100 whitespace-nowrap">
+//       {areEstimatesEnabledForCurrentProject
+//         ? estimateValue
+//         : `${currentPoint} ${currentPoint > 1 ? "points" : "point"}`}
+//     </span>
+//   );
+// });
 
 const inboxActivityMessage = {
   declined: {
@@ -267,7 +270,8 @@ const activityDetails: {
       else
         return (
           <>
-            set the estimate point to <EstimatePoint point={activity.new_value} />
+            set the estimate point to
+            {/* <EstimatePoint point={activity.new_value} /> */}
             {showIssue && (
               <>
                 {" "}
diff --git a/web/components/core/modals/gpt-assistant-popover.tsx b/web/components/core/modals/gpt-assistant-popover.tsx
index a67b13f7e..9843124e4 100644
--- a/web/components/core/modals/gpt-assistant-popover.tsx
+++ b/web/components/core/modals/gpt-assistant-popover.tsx
@@ -1,11 +1,11 @@
-import React, { useEffect, useState, useRef, Fragment } from "react";
+import React, { useEffect, useState, useRef, Fragment, Ref } from "react";
 import { Placement } from "@popperjs/core";
 import { useRouter } from "next/router";
 import { Controller, useForm } from "react-hook-form"; // services
 import { usePopper } from "react-popper";
 // ui
 import { AlertCircle } from "lucide-react";
-import { Popover, Transition } from "@headlessui/react";
+import { Popover, PopoverButton, PopoverPanel, Transition } from "@headlessui/react";
 import { Button, Input, TOAST_TYPE, setToast } from "@plane/ui";
 import { RichTextReadOnlyEditor } from "@/components/editor/rich-text-editor/rich-text-read-only-editor";
 // icons
@@ -173,14 +173,14 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {
   const generateResponseButtonText = isSubmitting
     ? "Generating response..."
     : response === ""
-    ? "Generate response"
-    : "Generate again";
+      ? "Generate response"
+      : "Generate again";
 
   return (
     <Popover as="div" className={`relative w-min text-left`}>
-      <Popover.Button as={Fragment}>
+      <PopoverButton as={Fragment}>
         <button ref={setReferenceElement}>{button}</button>
-      </Popover.Button>
+      </PopoverButton>
       <Transition
         show={isOpen}
         as={React.Fragment}
@@ -191,10 +191,10 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {
         leaveFrom="transform opacity-100 scale-100"
         leaveTo="transform opacity-0 scale-95"
       >
-        <Popover.Panel
+        <PopoverPanel
           as="div"
           className={`fixed z-10 flex w-full min-w-[50rem] max-w-full flex-col space-y-4 overflow-hidden rounded-[10px] border border-custom-border-200 bg-custom-background-100 p-4 shadow ${className}`}
-          ref={setPopperElement}
+          ref={setPopperElement as Ref<HTMLDivElement>}
           style={styles.popper}
           {...attributes.popper}
         >
@@ -261,7 +261,7 @@ export const GptAssistantPopover: React.FC<Props> = (props) => {
               </Button>
             </div>
           </div>
-        </Popover.Panel>
+        </PopoverPanel>
       </Transition>
     </Popover>
   );
diff --git a/web/components/dropdowns/estimate.tsx b/web/components/dropdowns/estimate.tsx
index 58243cc22..da0c77d9b 100644
--- a/web/components/dropdowns/estimate.tsx
+++ b/web/components/dropdowns/estimate.tsx
@@ -7,7 +7,10 @@ import { Combobox } from "@headlessui/react";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
-import { useAppRouter, useEstimate } from "@/hooks/store";
+import {
+  useAppRouter,
+  //  useEstimate
+} from "@/hooks/store";
 import { useDropdown } from "@/hooks/use-dropdown";
 // components
 import { DropdownButton } from "./buttons";
@@ -76,8 +79,12 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
   });
   // store hooks
   const { workspaceSlug } = useAppRouter();
-  const { fetchProjectEstimates, getProjectActiveEstimateDetails, getEstimatePointValue } = useEstimate();
-  const activeEstimate = getProjectActiveEstimateDetails(projectId);
+  console.log("workspaceSlug", workspaceSlug);
+  console.log("projectId", projectId);
+
+  // const { fetchProjectEstimates, getProjectActiveEstimateDetails, getEstimatePointValue } = useEstimate();
+  // const activeEstimate = getProjectActiveEstimateDetails(projectId);
+  const activeEstimate: any = undefined;
 
   const options: DropdownOptions = sortBy(activeEstimate?.points ?? [], "key")?.map((point) => ({
     value: point.key,
@@ -103,10 +110,14 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
   const filteredOptions =
     query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));
 
-  const selectedEstimate = value !== null ? getEstimatePointValue(value, projectId) : null;
+  const selectedEstimate =
+    value !== null
+      ? // getEstimatePointValue(value, projectId)
+        null
+      : null;
 
   const onOpen = async () => {
-    if (!activeEstimate && workspaceSlug) await fetchProjectEstimates(workspaceSlug, projectId);
+    // if (!activeEstimate && workspaceSlug) await fetchProjectEstimates(workspaceSlug, projectId);
   };
 
   const { handleClose, handleKeyDown, handleOnClick, searchInputKeyDown } = useDropdown({
diff --git a/web/components/empty-state/comic-box-button.tsx b/web/components/empty-state/comic-box-button.tsx
index 0bf546a2f..8aeba83eb 100644
--- a/web/components/empty-state/comic-box-button.tsx
+++ b/web/components/empty-state/comic-box-button.tsx
@@ -1,6 +1,6 @@
-import { useState } from "react";
+import { Ref, useState } from "react";
 import { usePopper } from "react-popper";
-import { Popover } from "@headlessui/react";
+import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
 // popper
 // helper
 import { getButtonStyling } from "@plane/ui";
@@ -42,7 +42,7 @@ export const ComicBoxButton: React.FC<Props> = (props) => {
 
   return (
     <Popover>
-      <Popover.Button ref={setReferenceElement} onClick={onClick} disabled={disabled}>
+      <PopoverButton ref={setReferenceElement} onClick={onClick} disabled={disabled}>
         <div className={`flex items-center gap-2.5 ${getButtonStyling("primary", "lg", disabled)}`}>
           {icon}
           <span className="leading-4">{label}</span>
@@ -55,12 +55,12 @@ export const ComicBoxButton: React.FC<Props> = (props) => {
             <div className={`absolute bg-blue-400/40 right-0 h-1.5 w-1.5 mt-0.5 mr-0.5 rounded-full`} />
           </span>
         </div>
-      </Popover.Button>
+      </PopoverButton>
       {isHovered && (
-        <Popover.Panel
+        <PopoverPanel
           as="div"
           className="flex flex-col rounded border border-custom-border-200 bg-custom-background-100 p-5 relative min-w-80"
-          ref={setPopperElement}
+          ref={setPopperElement as Ref<HTMLDivElement>}
           style={styles.popper}
           {...attributes.popper}
           static
@@ -68,7 +68,7 @@ export const ComicBoxButton: React.FC<Props> = (props) => {
           <div className="absolute w-2 h-2 bg-custom-background-100 border rounded-lb-sm  border-custom-border-200 border-r-0 border-t-0 transform rotate-45 bottom-2 -left-[5px]" />
           <h3 className="text-lg font-semibold w-full">{title}</h3>
           <h4 className="mt-1 text-sm">{description}</h4>
-        </Popover.Panel>
+        </PopoverPanel>
       )}
     </Popover>
   );
diff --git a/web/components/estimates-legacy/create-update-estimate-modal.tsx b/web/components/estimates-legacy/create-update-estimate-modal.tsx
deleted file mode 100644
index c8b44cc32..000000000
--- a/web/components/estimates-legacy/create-update-estimate-modal.tsx
+++ /dev/null
@@ -1,292 +0,0 @@
-import React, { useEffect } from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-import { Controller, useForm } from "react-hook-form";
-// types
-import { IEstimate, IEstimateFormData } from "@plane/types";
-// ui
-import { Button, Input, TextArea, TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
-// helpers
-import { checkDuplicates } from "@/helpers/array.helper";
-// hooks
-import { useEstimate } from "@/hooks/store";
-
-type Props = {
-  isOpen: boolean;
-  handleClose: () => void;
-  data?: IEstimate;
-};
-
-const defaultValues = {
-  name: "",
-  description: "",
-  value1: "",
-  value2: "",
-  value3: "",
-  value4: "",
-  value5: "",
-  value6: "",
-};
-
-type FormValues = typeof defaultValues;
-
-export const CreateUpdateEstimateModal: React.FC<Props> = observer((props) => {
-  const { handleClose, data, isOpen } = props;
-  // router
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-  // store hooks
-  const { createEstimate, updateEstimate } = useEstimate();
-  // form info
-  const {
-    formState: { errors, isSubmitting },
-    handleSubmit,
-    control,
-    reset,
-  } = useForm<FormValues>({
-    defaultValues,
-  });
-
-  const onClose = () => {
-    handleClose();
-    reset();
-  };
-
-  const handleCreateEstimate = async (payload: IEstimateFormData) => {
-    if (!workspaceSlug || !projectId) return;
-
-    await createEstimate(workspaceSlug.toString(), projectId.toString(), payload)
-      .then(() => {
-        onClose();
-      })
-      .catch((err) => {
-        const error = err?.error;
-        const errorString = Array.isArray(error) ? error[0] : error;
-
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message:
-            errorString ?? err.status === 400
-              ? "Estimate with that name already exists. Please try again with another name."
-              : "Estimate could not be created. Please try again.",
-        });
-      });
-  };
-
-  const handleUpdateEstimate = async (payload: IEstimateFormData) => {
-    if (!workspaceSlug || !projectId || !data) return;
-
-    await updateEstimate(workspaceSlug.toString(), projectId.toString(), data.id, payload)
-      .then(() => {
-        onClose();
-      })
-      .catch((err) => {
-        const error = err?.error;
-        const errorString = Array.isArray(error) ? error[0] : error;
-
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: errorString ?? "Estimate could not be updated. Please try again.",
-        });
-      });
-  };
-
-  const onSubmit = async (formData: FormValues) => {
-    if (!formData.name || formData.name === "") {
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Estimate title cannot be empty.",
-      });
-      return;
-    }
-
-    if (
-      formData.value1 === "" ||
-      formData.value2 === "" ||
-      formData.value3 === "" ||
-      formData.value4 === "" ||
-      formData.value5 === "" ||
-      formData.value6 === ""
-    ) {
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Estimate point cannot be empty.",
-      });
-      return;
-    }
-
-    if (
-      formData.value1.length > 20 ||
-      formData.value2.length > 20 ||
-      formData.value3.length > 20 ||
-      formData.value4.length > 20 ||
-      formData.value5.length > 20 ||
-      formData.value6.length > 20
-    ) {
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Estimate point cannot have more than 20 characters.",
-      });
-      return;
-    }
-
-    if (
-      checkDuplicates([
-        formData.value1,
-        formData.value2,
-        formData.value3,
-        formData.value4,
-        formData.value5,
-        formData.value6,
-      ])
-    ) {
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: "Estimate points cannot have duplicate values.",
-      });
-      return;
-    }
-
-    const payload: IEstimateFormData = {
-      estimate: {
-        name: formData.name,
-        description: formData.description,
-      },
-      estimate_points: [],
-    };
-
-    for (let i = 0; i < 6; i++) {
-      const point = {
-        key: i,
-        value: formData[`value${i + 1}` as keyof FormValues],
-      };
-
-      if (data)
-        payload.estimate_points.push({
-          id: data.points[i].id,
-          ...point,
-        });
-      else payload.estimate_points.push({ ...point });
-    }
-
-    if (data) await handleUpdateEstimate(payload);
-    else await handleCreateEstimate(payload);
-  };
-
-  useEffect(() => {
-    if (data)
-      reset({
-        ...defaultValues,
-        ...data,
-        value1: data.points[0]?.value,
-        value2: data.points[1]?.value,
-        value3: data.points[2]?.value,
-        value4: data.points[3]?.value,
-        value5: data.points[4]?.value,
-        value6: data.points[5]?.value,
-      });
-    else reset({ ...defaultValues });
-  }, [data, reset]);
-
-  return (
-    <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <div className="space-y-5 p-5">
-          <div className="text-xl font-medium text-custom-text-200">{data ? "Update" : "Create"} Estimate</div>
-          <div className="space-y-3">
-            <div>
-              <Controller
-                control={control}
-                name="name"
-                render={({ field: { value, onChange, ref } }) => (
-                  <Input
-                    id="name"
-                    name="name"
-                    type="name"
-                    value={value}
-                    onChange={onChange}
-                    ref={ref}
-                    hasError={Boolean(errors.name)}
-                    placeholder="Title"
-                    className="w-full text-base"
-                  />
-                )}
-              />
-            </div>
-            <div>
-              <Controller
-                name="description"
-                control={control}
-                render={({ field: { value, onChange } }) => (
-                  <TextArea
-                    id="description"
-                    name="description"
-                    value={value}
-                    placeholder="Description"
-                    onChange={onChange}
-                    className="w-full text-base resize-none min-h-24"
-                    hasError={Boolean(errors?.description)}
-                  />
-                )}
-              />
-            </div>
-          </div>
-          {/* list of all the points */}
-          {/* since they are all the same, we can use a loop to render them */}
-          <div className="grid grid-cols-3 gap-3">
-            {Array(6)
-              .fill(0)
-              .map((_, i) => (
-                <div className="flex items-center" key={i}>
-                  <span className="flex h-full items-center rounded-lg bg-custom-background-80">
-                    <span className="rounded-lg px-2 text-sm text-custom-text-200">{i + 1}</span>
-                    <span className="rounded-r-lg bg-custom-background-100">
-                      <Controller
-                        control={control}
-                        name={`value${i + 1}` as keyof FormValues}
-                        rules={{
-                          maxLength: {
-                            value: 20,
-                            message: "Estimate point must at most be of 20 characters",
-                          },
-                        }}
-                        render={({ field: { value, onChange, ref } }) => (
-                          <Input
-                            ref={ref}
-                            type="text"
-                            value={value}
-                            onChange={onChange}
-                            id={`value${i + 1}`}
-                            name={`value${i + 1}`}
-                            placeholder={`Point ${i + 1}`}
-                            className="w-full rounded-l-none"
-                            hasError={Boolean(errors[`value${i + 1}` as keyof FormValues])}
-                          />
-                        )}
-                      />
-                    </span>
-                  </span>
-                </div>
-              ))}
-          </div>
-        </div>
-        <div className="px-5 py-4 flex items-center justify-end gap-2 border-t-[0.5px] border-custom-border-200">
-          <Button variant="neutral-primary" size="sm" onClick={handleClose}>
-            Cancel
-          </Button>
-          <Button variant="primary" size="sm" type="submit" loading={isSubmitting}>
-            {data ? (isSubmitting ? "Updating" : "Update Estimate") : isSubmitting ? "Creating" : "Create Estimate"}
-          </Button>
-        </div>
-      </form>
-    </ModalCore>
-  );
-});
diff --git a/web/components/estimates-legacy/delete-estimate-modal.tsx b/web/components/estimates-legacy/delete-estimate-modal.tsx
deleted file mode 100644
index e77c3ecb0..000000000
--- a/web/components/estimates-legacy/delete-estimate-modal.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// types
-import { IEstimate } from "@plane/types";
-// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
-// hooks
-import { useEstimate } from "@/hooks/store";
-
-type Props = {
-  isOpen: boolean;
-  data: IEstimate | null;
-  handleClose: () => void;
-};
-
-export const DeleteEstimateModal: React.FC<Props> = observer((props) => {
-  const { isOpen, handleClose, data } = props;
-  // states
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  // router
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-  // store hooks
-  const { deleteEstimate } = useEstimate();
-
-  const handleEstimateDelete = async () => {
-    if (!workspaceSlug || !projectId) return;
-
-    setIsDeleteLoading(true);
-
-    // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-    const estimateId = data?.id!;
-
-    await deleteEstimate(workspaceSlug.toString(), projectId.toString(), estimateId)
-      .then(() => {
-        handleClose();
-      })
-      .catch((err) => {
-        const error = err?.error;
-        const errorString = Array.isArray(error) ? error[0] : error;
-
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: errorString ?? "Estimate could not be deleted. Please try again",
-        });
-      })
-      .finally(() => setIsDeleteLoading(false));
-  };
-
-  useEffect(() => {
-    setIsDeleteLoading(false);
-  }, [isOpen]);
-
-  const onClose = () => {
-    setIsDeleteLoading(false);
-    handleClose();
-  };
-
-  return (
-    <AlertModalCore
-      handleClose={onClose}
-      handleSubmit={handleEstimateDelete}
-      isDeleting={isDeleteLoading}
-      isOpen={isOpen}
-      title="Delete Estimate"
-      content={
-        <>
-          Are you sure you want to delete estimate-{" "}
-          <span className="break-words font-medium text-custom-text-100">{data?.name}</span>
-          {""}? All of the data related to the estiamte will be permanently removed. This action cannot be undone.
-        </>
-      }
-    />
-  );
-});
diff --git a/web/components/estimates-legacy/estimate-list-item.tsx b/web/components/estimates-legacy/estimate-list-item.tsx
deleted file mode 100644
index 82046e6b0..000000000
--- a/web/components/estimates-legacy/estimate-list-item.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import React from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// hooks
-import { Pencil, Trash2 } from "lucide-react";
-import { IEstimate } from "@plane/types";
-import { Button, CustomMenu, TOAST_TYPE, setToast } from "@plane/ui";
-import { orderArrayBy } from "@/helpers/array.helper";
-import { useProject } from "@/hooks/store";
-// ui
-//icons
-// helpers
-// types
-
-type Props = {
-  estimate: IEstimate;
-  editEstimate: (estimate: IEstimate) => void;
-  deleteEstimate: (estimateId: string) => void;
-};
-
-export const EstimateListItem: React.FC<Props> = observer((props) => {
-  const { estimate, editEstimate, deleteEstimate } = props;
-  // router
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-  // store hooks
-  const { currentProjectDetails, updateProject } = useProject();
-
-  const handleUseEstimate = async () => {
-    if (!workspaceSlug || !projectId) return;
-
-    await updateProject(workspaceSlug.toString(), projectId.toString(), {
-      estimate: estimate.id,
-    }).catch((err) => {
-      const error = err?.error;
-      const errorString = Array.isArray(error) ? error[0] : error;
-
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: errorString ?? "Estimate points could not be used. Please try again.",
-      });
-    });
-  };
-
-  return (
-    <>
-      <div className="gap-2 border-b border-custom-border-100 p-4">
-        <div className="flex items-center justify-between">
-          <div>
-            <h6 className="flex w-[40vw] items-center gap-2 truncate text-sm font-medium">
-              {estimate.name}
-              {currentProjectDetails?.estimate && currentProjectDetails?.estimate === estimate.id && (
-                <span className="rounded bg-green-500/20 px-2 py-0.5 text-xs text-green-500">In use</span>
-              )}
-            </h6>
-            <p className="font-sm w-[40vw] truncate text-[14px] font-normal text-custom-text-200">
-              {estimate.description}
-            </p>
-          </div>
-          <div className="flex items-center gap-2">
-            {currentProjectDetails?.estimate !== estimate?.id && estimate?.points?.length > 0 && (
-              <Button variant="neutral-primary" onClick={handleUseEstimate} size="sm">
-                Use
-              </Button>
-            )}
-            <CustomMenu ellipsis>
-              <CustomMenu.MenuItem
-                onClick={() => {
-                  editEstimate(estimate);
-                }}
-              >
-                <div className="flex items-center justify-start gap-2">
-                  <Pencil className="h-3.5 w-3.5" />
-                  <span>Edit estimate</span>
-                </div>
-              </CustomMenu.MenuItem>
-              {currentProjectDetails?.estimate !== estimate.id && (
-                <CustomMenu.MenuItem
-                  onClick={() => {
-                    deleteEstimate(estimate.id);
-                  }}
-                >
-                  <div className="flex items-center justify-start gap-2">
-                    <Trash2 className="h-3.5 w-3.5" />
-                    <span>Delete estimate</span>
-                  </div>
-                </CustomMenu.MenuItem>
-              )}
-            </CustomMenu>
-          </div>
-        </div>
-        {estimate?.points?.length > 0 ? (
-          <div className="flex text-xs text-custom-text-200">
-            Estimate points (
-            <span className="flex gap-1">
-              {orderArrayBy(estimate.points, "key").map((point, index) => (
-                <h6 key={point.id} className="text-custom-text-200">
-                  {point.value}
-                  {index !== estimate.points.length - 1 && ","}{" "}
-                </h6>
-              ))}
-            </span>
-            )
-          </div>
-        ) : (
-          <div>
-            <p className="text-xs text-custom-text-200">No estimate points</p>
-          </div>
-        )}
-      </div>
-    </>
-  );
-});
diff --git a/web/components/estimates-legacy/estimates-list.tsx b/web/components/estimates-legacy/estimates-list.tsx
deleted file mode 100644
index 5103726e5..000000000
--- a/web/components/estimates-legacy/estimates-list.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, { useState } from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-import { IEstimate } from "@plane/types";
-// store hooks
-import { Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";
-import { EmptyState } from "@/components/empty-state";
-import { CreateUpdateEstimateModal, DeleteEstimateModal, EstimateListItem } from "@/components/estimates-legacy";
-import { EmptyStateType } from "@/constants/empty-state";
-import { orderArrayBy } from "@/helpers/array.helper";
-import { useEstimate, useProject } from "@/hooks/store";
-// components
-// ui
-// types
-// helpers
-// constants
-
-export const EstimatesList: React.FC = observer(() => {
-  // states
-  const [estimateFormOpen, setEstimateFormOpen] = useState(false);
-  const [estimateToDelete, setEstimateToDelete] = useState<string | null>(null);
-  const [estimateToUpdate, setEstimateToUpdate] = useState<IEstimate | undefined>();
-  // router
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-  // store hooks
-  const { updateProject, currentProjectDetails } = useProject();
-  const { projectEstimates, getProjectEstimateById } = useEstimate();
-
-  const editEstimate = (estimate: IEstimate) => {
-    setEstimateFormOpen(true);
-    // Order the points array by key before updating the estimate to update state
-    setEstimateToUpdate({
-      ...estimate,
-      points: orderArrayBy(estimate.points, "key"),
-    });
-  };
-
-  const disableEstimates = () => {
-    if (!workspaceSlug || !projectId) return;
-
-    updateProject(workspaceSlug.toString(), projectId.toString(), { estimate: null }).catch((err) => {
-      const error = err?.error;
-      const errorString = Array.isArray(error) ? error[0] : error;
-
-      setToast({
-        type: TOAST_TYPE.ERROR,
-        title: "Error!",
-        message: errorString ?? "Estimate could not be disabled. Please try again",
-      });
-    });
-  };
-
-  return (
-    <>
-      <CreateUpdateEstimateModal
-        isOpen={estimateFormOpen}
-        data={estimateToUpdate}
-        handleClose={() => {
-          setEstimateFormOpen(false);
-          setEstimateToUpdate(undefined);
-        }}
-      />
-
-      <DeleteEstimateModal
-        isOpen={!!estimateToDelete}
-        handleClose={() => setEstimateToDelete(null)}
-        data={getProjectEstimateById(estimateToDelete!)}
-      />
-
-      <section className="flex items-center justify-between border-b border-custom-border-100 py-3.5">
-        <h3 className="text-xl font-medium">Estimates</h3>
-        <div className="col-span-12 space-y-5 sm:col-span-7">
-          <div className="flex items-center gap-2">
-            <Button
-              variant="primary"
-              onClick={() => {
-                setEstimateFormOpen(true);
-                setEstimateToUpdate(undefined);
-              }}
-              size="sm"
-            >
-              Add Estimate
-            </Button>
-            {currentProjectDetails?.estimate && (
-              <Button variant="neutral-primary" onClick={disableEstimates} size="sm">
-                Disable Estimates
-              </Button>
-            )}
-          </div>
-        </div>
-      </section>
-
-      {projectEstimates ? (
-        projectEstimates.length > 0 ? (
-          <section className="h-full overflow-y-auto bg-custom-background-100">
-            {projectEstimates.map((estimate) => (
-              <EstimateListItem
-                key={estimate.id}
-                estimate={estimate}
-                editEstimate={(estimate) => editEstimate(estimate)}
-                deleteEstimate={(estimateId) => setEstimateToDelete(estimateId)}
-              />
-            ))}
-          </section>
-        ) : (
-          <div className="h-full w-full py-8">
-            <EmptyState type={EmptyStateType.PROJECT_SETTINGS_ESTIMATE} />
-          </div>
-        )
-      ) : (
-        <Loader className="mt-5 space-y-5">
-          <Loader.Item height="40px" />
-          <Loader.Item height="40px" />
-          <Loader.Item height="40px" />
-          <Loader.Item height="40px" />
-        </Loader>
-      )}
-    </>
-  );
-});
diff --git a/web/components/estimates-legacy/index.ts b/web/components/estimates-legacy/index.ts
deleted file mode 100644
index 2f4733055..000000000
--- a/web/components/estimates-legacy/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./create-update-estimate-modal";
-export * from "./delete-estimate-modal";
-export * from "./estimate-list-item";
-export * from "./estimates-list";
diff --git a/web/components/estimates/create/modal.tsx b/web/components/estimates/create/modal.tsx
index bdc635882..c47a0b202 100644
--- a/web/components/estimates/create/modal.tsx
+++ b/web/components/estimates/create/modal.tsx
@@ -2,32 +2,35 @@ import { FC, useEffect, useMemo, useState } from "react";
 import cloneDeep from "lodash/cloneDeep";
 import { observer } from "mobx-react";
 import { ChevronLeft } from "lucide-react";
-import { IEstimate } from "@plane/types";
-import { Button } from "@plane/ui";
+import { IEstimate, IEstimateFormData } from "@plane/types";
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
 import { EstimateCreateStageOne, EstimateCreateStageTwo } from "@/components/estimates";
-import { TEstimateSystemKeys, EEstimateSystem, TEstimateSystemKeyObject } from "@/components/estimates/types";
+import { TEstimateSystemKeys, EEstimateSystem, TEstimatePointsObject } from "@/components/estimates/types";
 // constants
 import { ESTIMATE_SYSTEMS } from "@/constants/estimates";
-// ee components
+// hooks
+import { useProjectEstimates } from "@/hooks/store";
 
-type Props = {
+type TCreateEstimateModal = {
+  workspaceSlug: string;
+  projectId: string;
   isOpen: boolean;
   handleClose: () => void;
   data?: IEstimate;
 };
 
-export const CreateEstimateModal: FC<Props> = observer((props) => {
+export const CreateEstimateModal: FC<TCreateEstimateModal> = observer((props) => {
   // props
-  const { handleClose, isOpen } = props;
+  const { workspaceSlug, projectId, isOpen, handleClose } = props;
+  // hooks
+  const { createEstimate } = useProjectEstimates();
   // states
   const [estimateSystem, setEstimateSystem] = useState<TEstimateSystemKeys>(EEstimateSystem.POINTS);
-  const [estimatePoints, setEstimatePoints] = useState<TEstimateSystemKeyObject[TEstimateSystemKeys] | undefined>(
-    undefined
-  );
+  const [estimatePoints, setEstimatePoints] = useState<TEstimatePointsObject[] | undefined>(undefined);
 
-  const handleUpdatePoints = (newPoints: TEstimateSystemKeyObject[TEstimateSystemKeys] | undefined) => {
+  const handleUpdatePoints = (newPoints: TEstimatePointsObject[] | undefined) => {
     const points = cloneDeep(newPoints);
     setEstimatePoints(points);
   };
@@ -42,6 +45,46 @@ export const CreateEstimateModal: FC<Props> = observer((props) => {
   // derived values
   const renderEstimateStepsCount = useMemo(() => (estimatePoints ? "2" : "1"), [estimatePoints]);
 
+  const handleCreateEstimate = async () => {
+    try {
+      const validatedEstimatePoints: TEstimatePointsObject[] = [];
+      if ([EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateSystem)) {
+        estimatePoints?.map((estimatePoint) => {
+          if (estimatePoint.value && Number(estimatePoint.value)) validatedEstimatePoints.push(estimatePoint);
+        });
+      } else {
+        estimatePoints?.map((estimatePoint) => {
+          if (estimatePoint.value) validatedEstimatePoints.push(estimatePoint);
+        });
+      }
+
+      if (validatedEstimatePoints.length === estimatePoints?.length) {
+        const payload: IEstimateFormData = {
+          estimate: {
+            type: estimateSystem,
+          },
+          estimate_points: validatedEstimatePoints,
+        };
+
+        await createEstimate(workspaceSlug, projectId, payload);
+        handleClose();
+      } else {
+        setToast({
+          type: TOAST_TYPE.ERROR,
+          title: "Error!",
+          message: "something went wrong",
+        });
+      }
+    } catch (error) {
+      console.log(error);
+      setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "something went wrong",
+      });
+    }
+  };
+
   return (
     <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>
       <div className="relative space-y-6 py-5">
@@ -70,7 +113,7 @@ export const CreateEstimateModal: FC<Props> = observer((props) => {
             <EstimateCreateStageOne
               estimateSystem={estimateSystem}
               handleEstimateSystem={setEstimateSystem}
-              handleEstimatePoints={(templateType) =>
+              handleEstimatePoints={(templateType: string) =>
                 handleUpdatePoints(ESTIMATE_SYSTEMS[estimateSystem].templates[templateType].values)
               }
             />
@@ -89,7 +132,7 @@ export const CreateEstimateModal: FC<Props> = observer((props) => {
             Cancel
           </Button>
           {estimatePoints && (
-            <Button variant="primary" size="sm" onClick={handleClose}>
+            <Button variant="primary" size="sm" onClick={handleCreateEstimate}>
               Create Estimate
             </Button>
           )}
diff --git a/web/components/estimates/create/stage-one.tsx b/web/components/estimates/create/stage-one.tsx
index 0567298c3..9dd8c5614 100644
--- a/web/components/estimates/create/stage-one.tsx
+++ b/web/components/estimates/create/stage-one.tsx
@@ -9,7 +9,7 @@ import { ESTIMATE_SYSTEMS } from "@/constants/estimates";
 type TEstimateCreateStageOne = {
   estimateSystem: TEstimateSystemKeys;
   handleEstimateSystem: (value: TEstimateSystemKeys) => void;
-  handleEstimatePoints: (value: TEstimateSystemKeys) => void;
+  handleEstimatePoints: (value: string) => void;
 };
 
 export const EstimateCreateStageOne: FC<TEstimateCreateStageOne> = (props) => {
@@ -44,7 +44,7 @@ export const EstimateCreateStageOne: FC<TEstimateCreateStageOne> = (props) => {
             <button
               key={name}
               className="border border-custom-border-200 rounded-md p-2 text-left"
-              onClick={() => handleEstimatePoints(name as TEstimateSystemKeys)}
+              onClick={() => handleEstimatePoints(name)}
             >
               <p className="block text-sm">{currentEstimateSystem.templates[name]?.title}</p>
               <p className="text-xs text-gray-400">
diff --git a/web/components/estimates/create/stage-two.tsx b/web/components/estimates/create/stage-two.tsx
index 04c50da41..5c898df4e 100644
--- a/web/components/estimates/create/stage-two.tsx
+++ b/web/components/estimates/create/stage-two.tsx
@@ -3,20 +3,14 @@ import { Plus } from "lucide-react";
 import { Button, Sortable } from "@plane/ui";
 // components
 import { EstimateItem } from "@/components/estimates";
-import {
-  EEstimateSystem,
-  TEstimatePointNumeric,
-  TEstimatePointString,
-  TEstimateSystemKeyObject,
-  TEstimateSystemKeys,
-} from "@/components/estimates/types";
+import { EEstimateSystem, TEstimatePointsObject } from "@/components/estimates/types";
 // constants
 import { ESTIMATE_SYSTEMS } from "@/constants/estimates";
 
 type TEstimateCreateStageTwo = {
   estimateSystem: EEstimateSystem;
-  estimatePoints: TEstimateSystemKeyObject[TEstimateSystemKeys];
-  handleEstimatePoints: (value: TEstimateSystemKeyObject[TEstimateSystemKeys]) => void;
+  estimatePoints: TEstimatePointsObject[];
+  handleEstimatePoints: (value: TEstimatePointsObject[]) => void;
 };
 
 export const EstimateCreateStageTwo: FC<TEstimateCreateStageTwo> = (props) => {
@@ -26,20 +20,12 @@ export const EstimateCreateStageTwo: FC<TEstimateCreateStageTwo> = (props) => {
 
   const addNewEstimationPoint = () => {
     const currentEstimationPoints = estimatePoints;
-    if ([EEstimateSystem.POINTS, EEstimateSystem.TIME].includes(estimateSystem)) {
-      const newEstimationPoint: TEstimatePointNumeric = {
-        key: currentEstimationPoints.length + 1,
-        value: 0,
-      };
-      handleEstimatePoints([...currentEstimationPoints, newEstimationPoint] as TEstimatePointNumeric[]);
-    }
-    if (estimateSystem === EEstimateSystem.CATEGORIES) {
-      const newEstimationPoint: TEstimatePointString = {
-        key: currentEstimationPoints.length + 1,
-        value: "",
-      };
-      handleEstimatePoints([...currentEstimationPoints, newEstimationPoint] as TEstimatePointString[]);
-    }
+
+    const newEstimationPoint: TEstimatePointsObject = {
+      key: currentEstimationPoints.length + 1,
+      value: "0",
+    };
+    handleEstimatePoints([...currentEstimationPoints, newEstimationPoint]);
   };
 
   const deleteEstimationPoint = (index: number) => {
@@ -48,26 +34,21 @@ export const EstimateCreateStageTwo: FC<TEstimateCreateStageTwo> = (props) => {
     handleEstimatePoints(newEstimationPoints);
   };
 
-  const updatedSortedKeys = (updatedEstimatePoints: TEstimateSystemKeyObject[TEstimateSystemKeys]) =>
+  const updatedSortedKeys = (updatedEstimatePoints: TEstimatePointsObject[]) =>
     updatedEstimatePoints.map((item, index) => ({
       ...item,
       key: index + 1,
-    })) as TEstimateSystemKeyObject[TEstimateSystemKeys];
+    })) as TEstimatePointsObject[];
 
   return (
     <div className="space-y-4">
       <Sortable
-        data={estimatePoints as any}
-        render={(value: TEstimatePointString | TEstimatePointNumeric, index: number) => (
+        data={estimatePoints}
+        render={(value: TEstimatePointsObject, index: number) => (
           <EstimateItem item={value} deleteItem={() => deleteEstimationPoint(index)} />
         )}
-        onChange={(data: TEstimateSystemKeyObject[TEstimateSystemKeys]) => {
-          console.log("updatedSortedKeys(data)", updatedSortedKeys(data));
-          handleEstimatePoints(updatedSortedKeys(data));
-        }}
-        keyExtractor={(item: TEstimatePointString | TEstimatePointNumeric, index: number) =>
-          item?.id?.toString() || item.value.toString()
-        }
+        onChange={(data: TEstimatePointsObject[]) => handleEstimatePoints(updatedSortedKeys(data))}
+        keyExtractor={(item: TEstimatePointsObject) => item?.id?.toString() || item.value.toString()}
       />
 
       <Button prependIcon={<Plus />} onClick={addNewEstimationPoint}>
diff --git a/web/components/estimates/estimate-item.tsx b/web/components/estimates/estimate-item.tsx
index e881e5d18..a33b073a8 100644
--- a/web/components/estimates/estimate-item.tsx
+++ b/web/components/estimates/estimate-item.tsx
@@ -3,10 +3,10 @@ import { Check, GripVertical, MoveRight, Pencil, Trash2, X } from "lucide-react"
 import { Select } from "@headlessui/react";
 import { Draggable } from "@plane/ui";
 import { InlineEdit } from "./inline-editable";
-import { TEstimatePointNumeric, TEstimatePointString } from "./types";
+import { TEstimatePointsObject } from "./types";
 
 type Props = {
-  item: TEstimatePointNumeric | TEstimatePointString;
+  item: TEstimatePointsObject;
   deleteItem: () => void;
 };
 const EstimateItem = ({ item, deleteItem }: Props) => {
diff --git a/web/components/estimates/index.ts b/web/components/estimates/index.ts
index deaa289dc..3d90b6f09 100644
--- a/web/components/estimates/index.ts
+++ b/web/components/estimates/index.ts
@@ -3,6 +3,7 @@ export * from "./loader-screen";
 
 export * from "./estimate-search";
 export * from "./estimate-disable";
+export * from "./inline-editable";
 
 export * from "./root";
 export * from "./estimate-item";
diff --git a/web/components/estimates/inline-editable.tsx b/web/components/estimates/inline-editable.tsx
index a2ecfa3d7..e5847f6d8 100644
--- a/web/components/estimates/inline-editable.tsx
+++ b/web/components/estimates/inline-editable.tsx
@@ -7,7 +7,8 @@ type Props = {
   inputType?: HTMLInputTypeAttribute;
   isEditing?: boolean;
 };
-const InlineEdit = ({
+
+export const InlineEdit = ({
   onSave,
   value: defaultValue,
   inputType = "text",
@@ -62,5 +63,3 @@ const InlineEdit = ({
     </div>
   );
 };
-
-export { InlineEdit };
diff --git a/web/components/estimates/root.tsx b/web/components/estimates/root.tsx
index 3abe709f6..c6e02af6b 100644
--- a/web/components/estimates/root.tsx
+++ b/web/components/estimates/root.tsx
@@ -5,7 +5,6 @@ import { Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";
 // components
 import { EmptyState } from "@/components/empty-state";
 import { EstimateEmptyScreen, EstimateLoaderScreen, CreateEstimateModal } from "@/components/estimates";
-import { DeleteEstimateModal, EstimateListItem } from "@/components/estimates-legacy";
 // constants
 import { EmptyStateType } from "@/constants/empty-state";
 // ee components
@@ -21,29 +20,26 @@ export const EstimateRoot: FC<TEstimateRoot> = (props) => {
   const { workspaceSlug, projectId } = props;
   // hooks
   const { updateProject, currentProjectDetails } = useProject();
-  const { loader, projectEstimateIds, estimateById, getAllEstimates } = useProjectEstimates(projectId);
+  const { loader, projectEstimateIds, estimateById, getProjectEstimates } = useProjectEstimates();
   // states
   const [isEstimateCreateModalOpen, setIsEstimateCreateModalOpen] = useState(false);
-  const [isEstimateDeleteModalOpen, setIsEstimateDeleteModalOpen] = useState<string | null>(null);
+  // const [isEstimateDeleteModalOpen, setIsEstimateDeleteModalOpen] = useState<string | null>(null);
   const [estimateToUpdate, setEstimateToUpdate] = useState<IEstimate | undefined>();
 
-  console.log("workspaceSlug", workspaceSlug);
-  console.log("projectId", projectId);
-
   const { isLoading: isSWRLoading } = useSWR(
     workspaceSlug && projectId ? `PROJECT_ESTIMATES_${workspaceSlug}_${projectId}` : null,
-    async () => workspaceSlug && projectId && getAllEstimates()
+    async () => workspaceSlug && projectId && getProjectEstimates(workspaceSlug, projectId)
   );
 
-  const editEstimate = (estimate: IEstimate) => {
-    setIsEstimateCreateModalOpen(true);
-    console.log("estimate", estimate);
-    // Order the points array by key before updating the estimate to update state
-    // setEstimateToUpdate({
-    //   ...estimate,
-    //   points: orderArrayBy(estimate.points, "key"),
-    // });
-  };
+  // const editEstimate = (estimate: IEstimate) => {
+  //   setIsEstimateCreateModalOpen(true);
+  //   console.log("estimate", estimate);
+  //   // Order the points array by key before updating the estimate to update state
+  //   // setEstimateToUpdate({
+  //   //   ...estimate,
+  //   //   points: orderArrayBy(estimate.points, "key"),
+  //   // });
+  // };
 
   const disableEstimates = () => {
     if (!workspaceSlug || !projectId) return;
@@ -64,6 +60,7 @@ export const EstimateRoot: FC<TEstimateRoot> = (props) => {
     <div className="container mx-auto">
       <EstimateLoaderScreen />
       <EstimateEmptyScreen onButtonClick={() => {}} />
+
       {loader === "init-loader" || isSWRLoading ? (
         <Loader className="mt-5 space-y-5">
           <Loader.Item height="40px" />
@@ -109,12 +106,13 @@ export const EstimateRoot: FC<TEstimateRoot> = (props) => {
                   const estimate = estimateById(estimateId);
                   if (!estimate) return <></>;
                   return (
-                    <EstimateListItem
-                      key={estimateId}
-                      estimate={estimate}
-                      editEstimate={(estimate) => editEstimate(estimate)}
-                      deleteEstimate={(estimateId) => setIsEstimateDeleteModalOpen(estimateId)}
-                    />
+                    <></>
+                    // <EstimateListItem
+                    //   key={estimateId}
+                    //   estimate={estimate}
+                    //   editEstimate={(estimate) => editEstimate(estimate)}
+                    //   deleteEstimate={(estimateId) => setIsEstimateDeleteModalOpen(estimateId)}
+                    // />
                   );
                 })}
             </section>
@@ -122,7 +120,10 @@ export const EstimateRoot: FC<TEstimateRoot> = (props) => {
         </>
       )}
 
+      {/*  */}
       <CreateEstimateModal
+        workspaceSlug={workspaceSlug}
+        projectId={projectId}
         isOpen={isEstimateCreateModalOpen}
         data={estimateToUpdate}
         handleClose={() => {
@@ -130,14 +131,12 @@ export const EstimateRoot: FC<TEstimateRoot> = (props) => {
           setEstimateToUpdate(undefined);
         }}
       />
-      <DeleteEstimateModal
+
+      {/* <DeleteEstimateModal
         isOpen={!!isEstimateDeleteModalOpen}
         handleClose={() => setIsEstimateDeleteModalOpen(null)}
-        data={
-          null
-          // getProjectEstimateById(isEstimateDeleteModalOpen!)
-        }
-      />
+        data={}
+      /> */}
     </div>
   );
 };
diff --git a/web/components/estimates/types.ts b/web/components/estimates/types.ts
index 8d98ae725..186b6b682 100644
--- a/web/components/estimates/types.ts
+++ b/web/components/estimates/types.ts
@@ -5,25 +5,19 @@ export enum EEstimateSystem {
 }
 export type TEstimateSystemKeys = EEstimateSystem.POINTS | EEstimateSystem.CATEGORIES | EEstimateSystem.TIME;
 
-export type TEstimatePointString = { key: number; value: string; id: string };
-export type TEstimatePointNumeric = { key: number; value: number; id: string };
-export type TEstimateSystemKeyObject = {
-  points: TEstimatePointNumeric[];
-  categories: TEstimatePointString[];
-  time: TEstimatePointNumeric[];
-};
+export type TEstimatePointsObject = { id?: string | undefined; key: number; value: string };
 
-export type TTemplateValues<T extends TEstimateSystemKeys> = {
+export type TTemplateValues = {
   title: string;
-  values: TEstimateSystemKeyObject[T];
+  values: TEstimatePointsObject[];
 };
 
-export type TEstimateSystem<T extends TEstimateSystemKeys> = {
+export type TEstimateSystem = {
   name: string;
-  templates: Record<string, TTemplateValues<T>>;
+  templates: Record<string, TTemplateValues>;
   is_available: boolean;
 };
 
 export type TEstimateSystems = {
-  [K in TEstimateSystemKeys]: TEstimateSystem<K>;
+  [K in TEstimateSystemKeys]: TEstimateSystem;
 };
diff --git a/web/components/estimates/update-estimate-modal.tsx b/web/components/estimates/update-estimate-modal.tsx
deleted file mode 100644
index 501868d9b..000000000
--- a/web/components/estimates/update-estimate-modal.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-import React, { Fragment, useState } from "react";
-import { observer } from "mobx-react";
-// types
-import { ChevronLeft, Plus } from "lucide-react";
-import { IEstimate, IEstimateFormData } from "@plane/types";
-// ui
-import { SubHeading, TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
-import { RadioInput } from "@/components/radio-group";
-import { Sortable } from "@/components/sortable/sortable";
-import { EstimateItem } from "./estimate-item";
-import { useEstimate } from "@/hooks/store";
-import { useRouter } from "next/router";
-// helpers
-// hooks
-
-type Props = {
-  isOpen: boolean;
-  handleClose: () => void;
-  data?: IEstimate;
-};
-
-const ESTIMATE_SYSTEMS = {
-  Points: {
-    name: "Points",
-    templates: {
-      Fibonacci: [1, 2, 3, 5, 8, 13, 21],
-      Linear: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-      Squares: [1, 4, 9, 16, 25, 36],
-    },
-  },
-  Categories: {
-    name: "Categories",
-    templates: {
-      "T-Shirt Sizes": ["XS", "S", "M", "L", "XL", "XXL"],
-      "Easy to hard": ["Easy", "Medium", "Hard", "Very Hard"],
-    },
-  },
-  Time: {
-    name: "Time",
-    templates: { Hours: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] },
-  },
-};
-
-type EstimatePoint = {
-  id?: string;
-  key: number;
-  value: string;
-};
-export const UpdateEstimateModal: React.FC<Props> = observer((props) => {
-  const { handleClose, isOpen, data } = props;
-  const router = useRouter();
-  const { workspaceSlug, projectId } = router.query;
-  const { createEstimate, updateEstimate } = useEstimate();
-
-  console.log({ data });
-
-  const [estimateSystem, setEstimateSystem] = useState("Points");
-  const [points, setPoints] = useState<EstimatePoint[] | null>(data.points);
-
-  const currentEstimateSystem = ESTIMATE_SYSTEMS[estimateSystem];
-
-  const deleteItem = (index: number) => {
-    points.splice(index, 1);
-    setPoints([...points]);
-  };
-
-  const saveEstimate = async () => {
-    if (!workspaceSlug || !projectId || !data) return;
-
-    console.log({ points });
-
-    const payload: IEstimateFormData = {
-      estimate_points: points?.map((point, index) => {
-        point.key = index;
-        return point;
-      }),
-      estimate: {
-        name: data.name,
-        description: data.description,
-      },
-    };
-
-    console.log({ payload });
-
-    await updateEstimate(workspaceSlug.toString(), projectId.toString(), data.id, payload)
-      .then(() => {
-        // onClose();
-      })
-      .catch((err) => {
-        const error = err?.error;
-        const errorString = Array.isArray(error) ? error[0] : error;
-
-        setToast({
-          type: TOAST_TYPE.ERROR,
-          title: "Error!",
-          message: errorString ?? "Estimate could not be updated. Please try again.",
-        });
-      });
-  };
-
-  return (
-    <ModalCore isOpen={isOpen} handleClose={handleClose} position={EModalPosition.TOP} width={EModalWidth.XXL}>
-      <div className="p-5">
-        {!points && (
-          <Fragment>
-            <div className="flex justify-between items-center mb-6">
-              <div className="flex justify-start align-middle  items-center ">
-                <SubHeading noMargin>New Estimate System</SubHeading>
-              </div>
-              <div>
-                <span className="text-xs text-gray-400">Step 2/2</span>
-              </div>
-            </div>
-            <form onSubmit={() => console.log("Submitted")}>
-              <div className="space-y-4 sm:flex sm:items-center sm:space-x-10 sm:space-y-0 gap-2 mb-2">
-                <RadioInput
-                  options={Object.keys(ESTIMATE_SYSTEMS).map((name) => ({ label: name, value: name }))}
-                  label="Choose an estimate system"
-                  selected={estimateSystem}
-                  onChange={(value) => setEstimateSystem(value)}
-                  className="mb-4"
-                />
-              </div>
-              <SubHeading>Choose a template</SubHeading>
-              <div className="flex flex-wrap gap-5 grid sm:grid-cols-2 mb-8">
-                {Object.keys(currentEstimateSystem.templates).map((name) => (
-                  <button
-                    key={name}
-                    className="  border border-custom-border-200 rounded-md p-2 text-left"
-                    onClick={() =>
-                      setPoints(
-                        currentEstimateSystem.templates[name].map((value: number | string, key: number) => ({
-                          value,
-                          key,
-                        }))
-                      )
-                    }
-                  >
-                    <p className="block text-sm">{name}</p>
-                    <p className="text-xs text-gray-400">{currentEstimateSystem.templates[name].join(", ")}</p>
-                  </button>
-                ))}
-              </div>
-
-              {/* Add modal footer */}
-            </form>
-          </Fragment>
-        )}
-
-        {points && (
-          <div>
-            <div className="flex justify-between items-center mb-6">
-              <div className="flex justify-start   items-center">
-                <button onClick={() => setPoints(null)}>
-                  <ChevronLeft className="w-6 h-6 mr-1" />
-                </button>
-                <SubHeading noMargin>New Estimate System</SubHeading>
-              </div>
-              <div>
-                <span className="text-xs text-gray-400">Step 2/2</span>
-              </div>
-            </div>
-
-            <Sortable
-              data={points}
-              render={(value: string, index: number) => (
-                <EstimateItem item={value} deleteItem={() => deleteItem(index)} />
-              )}
-              onChange={(data: number[]) => setPoints(data)}
-              keyExtractor={(value: number) => value}
-            />
-            <button
-              className=" bg-custom-primary text-white rounded-md px-3 py-1 flex items-center gap-1"
-              onClick={() => {
-                setPoints([...points, ""]);
-              }}
-            >
-              <Plus className="w-4 h-4" />
-              <span className="text-sm">Add {estimateSystem}</span>
-            </button>
-          </div>
-        )}
-
-        <div className="flex justify-end mt-5 border-t -m-5 px-5 py-3 ">
-          <button
-            type="button"
-            onClick={handleClose}
-            className="inline-flex justify-center px-4 py-1 text-sm font-medium text-white bg-custom-primary border border-transparent rounded-md shadow-sm hover:bg-custom-primary-dark focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-custom-primary-dark"
-          >
-            Cancel
-          </button>
-          {points && (
-            <button
-              type="submit"
-              className="inline-flex justify-center px-4 py-1 ml-3 text-sm font-medium text-white bg-custom-primary border border-transparent rounded-md shadow-sm hover:bg-custom-primary-dark focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-custom-primary-dark"
-              onClick={saveEstimate}
-            >
-              Create Estimate
-            </button>
-          )}
-        </div>
-      </div>
-    </ModalCore>
-  );
-});
diff --git a/web/components/estimates/update/modal.tsx b/web/components/estimates/update/modal.tsx
index 86ee16f34..ade86f0eb 100644
--- a/web/components/estimates/update/modal.tsx
+++ b/web/components/estimates/update/modal.tsx
@@ -5,7 +5,7 @@ import { Button } from "@plane/ui";
 // components
 import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
 // types
-import { TEstimateSystemKeys, TEstimateSystemKeyObject } from "@/components/estimates/types";
+import { TEstimatePointsObject } from "@/components/estimates/types";
 
 type Props = {
   isOpen: boolean;
@@ -17,9 +17,7 @@ export const UpdateEstimateModal: FC<Props> = observer((props) => {
   // props
   const { handleClose, isOpen } = props;
   // states
-  const [estimatePoints, setEstimatePoints] = useState<TEstimateSystemKeyObject[TEstimateSystemKeys] | undefined>(
-    undefined
-  );
+  const [estimatePoints, setEstimatePoints] = useState<TEstimatePointsObject[] | undefined>(undefined);
 
   useEffect(() => {
     if (!isOpen) {
diff --git a/web/components/inbox/modals/create-edit-modal/issue-properties.tsx b/web/components/inbox/modals/create-edit-modal/issue-properties.tsx
index e55834f6e..b020315f0 100644
--- a/web/components/inbox/modals/create-edit-modal/issue-properties.tsx
+++ b/web/components/inbox/modals/create-edit-modal/issue-properties.tsx
@@ -17,7 +17,7 @@ import { IssueLabelSelect } from "@/components/issues/select";
 // helpers
 import { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper";
 // hooks
-import { useEstimate } from "@/hooks/store";
+import { useProjectEstimates } from "@/hooks/store";
 
 type TInboxIssueProperties = {
   projectId: string;
@@ -29,7 +29,7 @@ type TInboxIssueProperties = {
 export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props) => {
   const { projectId, data, handleData, isVisible = false } = props;
   // hooks
-  const { areEstimatesEnabledForProject } = useEstimate();
+  const { areEstimateEnabledByProjectId } = useProjectEstimates();
   // states
   const [parentIssueModalOpen, setParentIssueModalOpen] = useState(false);
   const [selectedParentIssue, setSelectedParentIssue] = useState<ISearchIssueResponse | undefined>(undefined);
@@ -142,7 +142,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
       )}
 
       {/* estimate */}
-      {isVisible && areEstimatesEnabledForProject(projectId) && (
+      {isVisible && areEstimateEnabledByProjectId(projectId) && (
         <div className="h-7">
           <EstimateDropdown
             value={data?.estimate_point || null}
diff --git a/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx b/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
index 9179bfa38..c7046b479 100644
--- a/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
+++ b/web/components/issues/issue-detail/issue-activity/activity/actions/estimate.tsx
@@ -2,7 +2,10 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { Triangle } from "lucide-react";
 // hooks
-import { useEstimate, useIssueDetail } from "@/hooks/store";
+import {
+  // useEstimate,
+  useIssueDetail,
+} from "@/hooks/store";
 // components
 import { IssueActivityBlockComponent, IssueLink } from "./";
 
@@ -14,13 +17,15 @@ export const IssueEstimateActivity: FC<TIssueEstimateActivity> = observer((props
   const {
     activity: { getActivityById },
   } = useIssueDetail();
-  const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();
+  // const { areEstimatesEnabledForCurrentProject, getEstimatePointValue } = useEstimate();
+  const areEstimatesEnabledForCurrentProject = false;
 
   const activity = getActivityById(activityId);
 
   if (!activity) return <></>;
 
-  const estimateValue = getEstimatePointValue(Number(activity.new_value), null);
+  // const estimateValue = getEstimatePointValue(Number(activity.new_value), null);
+  const estimateValue = "None";
   const currentPoint = Number(activity.new_value) + 1;
 
   return (
diff --git a/web/components/issues/issue-detail/sidebar.tsx b/web/components/issues/issue-detail/sidebar.tsx
index a9a23ebdc..3892c0d84 100644
--- a/web/components/issues/issue-detail/sidebar.tsx
+++ b/web/components/issues/issue-detail/sidebar.tsx
@@ -54,7 +54,13 @@ import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper"
 import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
 import { copyTextToClipboard } from "@/helpers/string.helper";
 // types
-import { useEstimate, useIssueDetail, useProject, useProjectState, useUser } from "@/hooks/store";
+import {
+  // useEstimate,
+  useIssueDetail,
+  useProject,
+  useProjectState,
+  useUser,
+} from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // components
 import type { TIssueOperations } from "./root";
@@ -82,7 +88,8 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
   // store hooks
   const { getProjectById } = useProject();
   const { data: currentUser } = useUser();
-  const { areEstimatesEnabledForCurrentProject } = useEstimate();
+  // const { areEstimatesEnabledForCurrentProject } = useEstimate();
+  const areEstimatesEnabledForCurrentProject = false;
   const {
     issue: { getIssueById },
   } = useIssueDetail();
diff --git a/web/components/issues/issue-layouts/properties/all-properties.tsx b/web/components/issues/issue-layouts/properties/all-properties.tsx
index 79f2fca70..48283d90c 100644
--- a/web/components/issues/issue-layouts/properties/all-properties.tsx
+++ b/web/components/issues/issue-layouts/properties/all-properties.tsx
@@ -26,7 +26,7 @@ import { cn } from "@/helpers/common.helper";
 import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";
 import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
 // hooks
-import { useEventTracker, useEstimate, useLabel, useIssues, useProjectState, useProject } from "@/hooks/store";
+import { useEventTracker, useLabel, useIssues, useProjectState, useProject, useProjectEstimates } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // local components
 import { IssuePropertyLabels } from "../properties/labels";
@@ -42,6 +42,9 @@ export interface IIssueProperties {
 }
 
 export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
+  // router
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
   const { issue, updateIssue, displayProperties, activeLayout, isReadOnly, className } = props;
   // store hooks
   const { getProjectById } = useProject();
@@ -53,13 +56,10 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
   const {
     issues: { addCycleToIssue, removeCycleFromIssue },
   } = useIssues(EIssuesStoreType.CYCLE);
-  const { areEstimatesEnabledForCurrentProject } = useEstimate();
+  const { areEstimateEnabledByProjectId } = useProjectEstimates();
   const { getStateById } = useProjectState();
   const { isMobile } = usePlatformOS();
   const projectDetails = getProjectById(issue.project_id);
-  // router
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
   const currentLayout = `${activeLayout} layout`;
   // derived values
   const stateDetails = getStateById(issue.state_id);
@@ -394,7 +394,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
       )}
 
       {/* estimates */}
-      {areEstimatesEnabledForCurrentProject && (
+      {projectId && areEstimateEnabledByProjectId(projectId?.toString()) && (
         <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="estimate">
           <div className="h-5" onClick={handleEventPropagation}>
             <EstimateDropdown
diff --git a/web/components/issues/issue-modal/form.tsx b/web/components/issues/issue-modal/form.tsx
index 4c608f83a..03aa4b00c 100644
--- a/web/components/issues/issue-modal/form.tsx
+++ b/web/components/issues/issue-modal/form.tsx
@@ -28,7 +28,14 @@ import { renderFormattedPayloadDate, getDate } from "@/helpers/date-time.helper"
 import { getChangedIssuefields, getDescriptionPlaceholder } from "@/helpers/issue.helper";
 import { shouldRenderProject } from "@/helpers/project.helper";
 // hooks
-import { useAppRouter, useEstimate, useInstance, useIssueDetail, useProject, useWorkspace } from "@/hooks/store";
+import {
+  useAppRouter,
+  useInstance,
+  useIssueDetail,
+  useProject,
+  useWorkspace,
+  useProjectEstimates,
+} from "@/hooks/store";
 import { useProjectIssueProperties } from "@/hooks/use-project-issue-properties";
 // services
 import { AIService } from "@/services/ai.service";
@@ -118,7 +125,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
   const { projectId: routeProjectId } = useAppRouter();
   const { config } = useInstance();
   const { getProjectById } = useProject();
-  const { areEstimatesEnabledForProject } = useEstimate();
+  const { areEstimateEnabledByProjectId } = useProjectEstimates();
 
   const {
     issue: { getIssueById },
@@ -631,7 +638,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                   )}
                 />
               )}
-              {areEstimatesEnabledForProject(projectId) && (
+              {projectId && areEstimateEnabledByProjectId(projectId) && (
                 <Controller
                   control={control}
                   name="estimate_point"
diff --git a/web/components/workspace/sidebar-dropdown.tsx b/web/components/workspace/sidebar-dropdown.tsx
index 9e71edd41..fcc1c7b59 100644
--- a/web/components/workspace/sidebar-dropdown.tsx
+++ b/web/components/workspace/sidebar-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Fragment, useState } from "react";
+import { Fragment, Ref, useState } from "react";
 import { observer } from "mobx-react";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -6,7 +6,7 @@ import { usePopper } from "react-popper";
 // icons
 import { Check, ChevronDown, CircleUserRound, LogOut, Mails, PlusSquare, Settings, UserCircle2 } from "lucide-react";
 // ui
-import { Menu, Transition } from "@headlessui/react";
+import { Menu, MenuButton, MenuItem, MenuItems, Transition } from "@headlessui/react";
 // types
 import { IWorkspace } from "@plane/types";
 // plane ui
@@ -104,7 +104,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
       <Menu as="div" className="relative h-full flex-grow truncate text-left">
         {({ open }) => (
           <>
-            <Menu.Button className="group/menu-button h-full w-full truncate rounded-md text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:outline-none">
+            <MenuButton className="group/menu-button h-full w-full truncate rounded-md text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:outline-none">
               <div
                 className={`flex items-center  gap-x-2 truncate rounded p-1 ${
                   sidebarCollapsed ? "justify-center" : "justify-between"
@@ -126,7 +126,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
                   />
                 )}
               </div>
-            </Menu.Button>
+            </MenuButton>
             <Transition
               as={Fragment}
               enter="transition ease-out duration-100"
@@ -136,7 +136,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
               leaveFrom="transform opacity-100 scale-100"
               leaveTo="transform opacity-0 scale-95"
             >
-              <Menu.Items as={Fragment}>
+              <MenuItems as={Fragment}>
                 <div className="fixed left-4 z-20 mt-1 flex w-full max-w-[19rem] origin-top-left flex-col divide-y divide-custom-border-100 rounded-md border-[0.5px] border-custom-sidebar-border-300 bg-custom-sidebar-background-100 shadow-custom-shadow-rg outline-none">
                   <div className="vertical-scrollbar scrollbar-sm mb-2 flex max-h-96 flex-col items-start justify-start gap-2 overflow-y-scroll px-4">
                     <h6 className="sticky top-0 z-10 h-full w-full bg-custom-sidebar-background-100 pb-1 pt-3 text-sm font-medium text-custom-sidebar-text-400">
@@ -155,7 +155,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
                               }}
                               className="w-full"
                             >
-                              <Menu.Item
+                              <MenuItem
                                 as="div"
                                 className="flex items-center justify-between gap-1 rounded p-1 text-sm text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80"
                               >
@@ -188,7 +188,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
                                     <Check className="h-5 w-5 text-custom-sidebar-text-100" />
                                   </span>
                                 )}
-                              </Menu.Item>
+                              </MenuItem>
                             </Link>
                           ))}
                       </div>
@@ -203,13 +203,13 @@ export const WorkspaceSidebarDropdown = observer(() => {
                   </div>
                   <div className="flex w-full flex-col items-start justify-start gap-2 px-4 py-2 text-sm">
                     <Link href="/create-workspace" className="w-full">
-                      <Menu.Item
+                      <MenuItem
                         as="div"
                         className="flex items-center gap-2 rounded px-2 py-1 text-sm font-medium text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80"
                       >
                         <PlusSquare strokeWidth={1.75} className="h-4 w-4 flex-shrink-0" />
                         Create workspace
-                      </Menu.Item>
+                      </MenuItem>
                     </Link>
                     {userLinks(workspaceSlug?.toString() ?? "", currentUser?.id ?? "").map((link, index) => (
                       <Link
@@ -220,18 +220,18 @@ export const WorkspaceSidebarDropdown = observer(() => {
                           if (index > 0) handleItemClick();
                         }}
                       >
-                        <Menu.Item
+                        <MenuItem
                           as="div"
                           className="flex items-center gap-2 rounded px-2 py-1 text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
                         >
                           <link.icon className="h-4 w-4 flex-shrink-0" />
                           {link.name}
-                        </Menu.Item>
+                        </MenuItem>
                       </Link>
                     ))}
                   </div>
                   <div className="w-full px-4 py-2">
-                    <Menu.Item
+                    <MenuItem
                       as="button"
                       type="button"
                       className="flex w-full items-center gap-2 rounded px-2 py-1 text-sm font-medium text-red-600 hover:bg-custom-sidebar-background-80"
@@ -239,17 +239,17 @@ export const WorkspaceSidebarDropdown = observer(() => {
                     >
                       <LogOut className="h-4 w-4 flex-shrink-0" />
                       Sign out
-                    </Menu.Item>
+                    </MenuItem>
                   </div>
                 </div>
-              </Menu.Items>
+              </MenuItems>
             </Transition>
           </>
         )}
       </Menu>
       {!sidebarCollapsed && (
         <Menu as="div" className="relative flex-shrink-0">
-          <Menu.Button className="grid place-items-center outline-none" ref={setReferenceElement}>
+          <MenuButton className="grid place-items-center outline-none" ref={setReferenceElement}>
             <Avatar
               name={currentUser?.display_name}
               src={currentUser?.avatar || undefined}
@@ -257,7 +257,7 @@ export const WorkspaceSidebarDropdown = observer(() => {
               shape="square"
               className="!text-base"
             />
-          </Menu.Button>
+          </MenuButton>
           <Transition
             as={Fragment}
             enter="transition ease-out duration-100"
@@ -267,10 +267,10 @@ export const WorkspaceSidebarDropdown = observer(() => {
             leaveFrom="transform opacity-100 scale-100"
             leaveTo="transform opacity-0 scale-95"
           >
-            <Menu.Items
+            <MenuItems
               className="absolute left-0 z-20 mt-1 flex w-52 origin-top-left  flex-col divide-y
-          divide-custom-sidebar-border-200 rounded-md border border-custom-sidebar-border-200 bg-custom-sidebar-background-100 px-1 py-2 text-xs shadow-lg outline-none"
-              ref={setPopperElement}
+            divide-custom-sidebar-border-200 rounded-md border border-custom-sidebar-border-200 bg-custom-sidebar-background-100 px-1 py-2 text-xs shadow-lg outline-none"
+              ref={setPopperElement as Ref<HTMLDivElement>}
               style={styles.popper}
               {...attributes.popper}
             >
@@ -284,17 +284,17 @@ export const WorkspaceSidebarDropdown = observer(() => {
                       if (index == 0) handleItemClick();
                     }}
                   >
-                    <Menu.Item key={index} as="div">
+                    <MenuItem key={index} as="div">
                       <span className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80">
                         <link.icon className="h-4 w-4 stroke-[1.5]" />
                         {link.name}
                       </span>
-                    </Menu.Item>
+                    </MenuItem>
                   </Link>
                 ))}
               </div>
               <div className={`pt-2 ${isUserInstanceAdmin || false ? "pb-2" : ""}`}>
-                <Menu.Item
+                <MenuItem
                   as="button"
                   type="button"
                   className="flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-custom-sidebar-background-80"
@@ -302,20 +302,20 @@ export const WorkspaceSidebarDropdown = observer(() => {
                 >
                   <LogOut className="h-4 w-4 stroke-[1.5]" />
                   Sign out
-                </Menu.Item>
+                </MenuItem>
               </div>
               {isUserInstanceAdmin && (
                 <div className="p-2 pb-0">
                   <Link href={GOD_MODE_URL}>
-                    <Menu.Item as="button" type="button" className="w-full">
+                    <MenuItem as="button" type="button" className="w-full">
                       <span className="flex w-full items-center justify-center rounded bg-custom-primary-100/20 px-2 py-1 text-sm font-medium text-custom-primary-100 hover:bg-custom-primary-100/30 hover:text-custom-primary-200">
                         Enter God Mode
                       </span>
-                    </Menu.Item>
+                    </MenuItem>
                   </Link>
                 </div>
               )}
-            </Menu.Items>
+            </MenuItems>
           </Transition>
         </Menu>
       )}
diff --git a/web/constants/estimates.ts b/web/constants/estimates.ts
index 3216d5798..05a05cc11 100644
--- a/web/constants/estimates.ts
+++ b/web/constants/estimates.ts
@@ -7,39 +7,39 @@ export const ESTIMATE_SYSTEMS: TEstimateSystems = {
       fibonacci: {
         title: "Fibonacci",
         values: [
-          { key: 1, value: 1 },
-          { key: 2, value: 2 },
-          { key: 3, value: 3 },
-          { key: 4, value: 5 },
-          { key: 5, value: 8 },
-          { key: 6, value: 13 },
-          { key: 7, value: 21 },
+          { id: undefined, key: 1, value: "1" },
+          { id: undefined, key: 2, value: "2" },
+          { id: undefined, key: 3, value: "3" },
+          { id: undefined, key: 4, value: "5" },
+          { id: undefined, key: 5, value: "8" },
+          { id: undefined, key: 6, value: "13" },
+          { id: undefined, key: 7, value: "21" },
         ],
       },
       linear: {
         title: "Linear",
         values: [
-          { key: 1, value: 1 },
-          { key: 2, value: 2 },
-          { key: 3, value: 3 },
-          { key: 4, value: 4 },
-          { key: 5, value: 5 },
-          { key: 6, value: 6 },
-          { key: 7, value: 7 },
-          { key: 8, value: 8 },
-          { key: 9, value: 9 },
-          { key: 10, value: 10 },
+          { id: undefined, key: 1, value: "1" },
+          { id: undefined, key: 2, value: "2" },
+          { id: undefined, key: 3, value: "3" },
+          { id: undefined, key: 4, value: "4" },
+          { id: undefined, key: 5, value: "5" },
+          { id: undefined, key: 6, value: "6" },
+          { id: undefined, key: 7, value: "7" },
+          { id: undefined, key: 8, value: "8" },
+          { id: undefined, key: 9, value: "9" },
+          { id: undefined, key: 10, value: "10" },
         ],
       },
       squares: {
         title: "Squares",
         values: [
-          { key: 1, value: 1 },
-          { key: 2, value: 4 },
-          { key: 3, value: 9 },
-          { key: 4, value: 16 },
-          { key: 5, value: 25 },
-          { key: 6, value: 36 },
+          { id: undefined, key: 1, value: "1" },
+          { id: undefined, key: 2, value: "4" },
+          { id: undefined, key: 3, value: "9" },
+          { id: undefined, key: 4, value: "16" },
+          { id: undefined, key: 5, value: "25" },
+          { id: undefined, key: 6, value: "36" },
         ],
       },
     },
@@ -51,21 +51,21 @@ export const ESTIMATE_SYSTEMS: TEstimateSystems = {
       t_shirt_sizes: {
         title: "T-Shirt Sizes",
         values: [
-          { key: 1, value: "XS" },
-          { key: 2, value: "S" },
-          { key: 3, value: "M" },
-          { key: 4, value: "L" },
-          { key: 5, value: "XL" },
-          { key: 6, value: "XXL" },
+          { id: undefined, key: 1, value: "XS" },
+          { id: undefined, key: 2, value: "S" },
+          { id: undefined, key: 3, value: "M" },
+          { id: undefined, key: 4, value: "L" },
+          { id: undefined, key: 5, value: "XL" },
+          { id: undefined, key: 6, value: "XXL" },
         ],
       },
       easy_to_hard: {
         title: "Easy to hard",
         values: [
-          { key: 1, value: "Easy" },
-          { key: 2, value: "Medium" },
-          { key: 3, value: "Hard" },
-          { key: 4, value: "Very Hard" },
+          { id: undefined, key: 1, value: "Easy" },
+          { id: undefined, key: 2, value: "Medium" },
+          { id: undefined, key: 3, value: "Hard" },
+          { id: undefined, key: 4, value: "Very Hard" },
         ],
       },
     },
@@ -77,16 +77,16 @@ export const ESTIMATE_SYSTEMS: TEstimateSystems = {
       hours: {
         title: "Hours",
         values: [
-          { key: 1, value: 1 },
-          { key: 2, value: 2 },
-          { key: 3, value: 3 },
-          { key: 4, value: 4 },
-          { key: 5, value: 5 },
-          { key: 6, value: 6 },
-          { key: 7, value: 7 },
-          { key: 8, value: 8 },
-          { key: 9, value: 9 },
-          { key: 10, value: 10 },
+          { id: undefined, key: 1, value: "1" },
+          { id: undefined, key: 2, value: "2" },
+          { id: undefined, key: 3, value: "3" },
+          { id: undefined, key: 4, value: "4" },
+          { id: undefined, key: 5, value: "5" },
+          { id: undefined, key: 6, value: "6" },
+          { id: undefined, key: 7, value: "7" },
+          { id: undefined, key: 8, value: "8" },
+          { id: undefined, key: 9, value: "9" },
+          { id: undefined, key: 10, value: "10" },
         ],
       },
     },
diff --git a/web/hooks/store/estimates/use-project-estimate.ts b/web/hooks/store/estimates/use-project-estimate.ts
index f4179eee1..6225a1cb6 100644
--- a/web/hooks/store/estimates/use-project-estimate.ts
+++ b/web/hooks/store/estimates/use-project-estimate.ts
@@ -4,11 +4,9 @@ import { StoreContext } from "@/lib/store-context";
 // mobx store
 import { IProjectEstimateStore } from "@/store/estimates/project-estimate.store";
 
-export const useProjectEstimates = (projectId: string | undefined): IProjectEstimateStore => {
+export const useProjectEstimates = (): IProjectEstimateStore => {
   const context = useContext(StoreContext);
   if (context === undefined) throw new Error("useProjectPage must be used within StoreProvider");
 
-  if (!projectId) throw new Error("projectId must be passed as a property");
-
   return context.projectEstimate;
 };
diff --git a/web/hooks/use-project-issue-properties.ts b/web/hooks/use-project-issue-properties.ts
index 195dd4e5c..e06e745c3 100644
--- a/web/hooks/use-project-issue-properties.ts
+++ b/web/hooks/use-project-issue-properties.ts
@@ -1,4 +1,4 @@
-import { useCycle, useEstimate, useLabel, useMember, useModule, useProjectState } from "./store";
+import { useCycle, useProjectEstimates, useLabel, useMember, useModule, useProjectState } from "./store";
 
 export const useProjectIssueProperties = () => {
   const { fetchProjectStates } = useProjectState();
@@ -8,7 +8,7 @@ export const useProjectIssueProperties = () => {
   const { fetchProjectLabels } = useLabel();
   const { fetchAllCycles: fetchProjectAllCycles } = useCycle();
   const { fetchModules: fetchProjectAllModules } = useModule();
-  const { fetchProjectEstimates } = useEstimate();
+  const { getProjectEstimates } = useProjectEstimates();
 
   // fetching project states
   const fetchStates = async (
@@ -62,7 +62,7 @@ export const useProjectIssueProperties = () => {
     projectId: string | string[] | undefined
   ) => {
     if (workspaceSlug && projectId) {
-      await fetchProjectEstimates(workspaceSlug.toString(), projectId.toString());
+      await getProjectEstimates(workspaceSlug.toString(), projectId.toString());
     }
   };
 
diff --git a/web/hooks/use-workspace-issue-properties.ts b/web/hooks/use-workspace-issue-properties.ts
index 8622100aa..4cad3a2df 100644
--- a/web/hooks/use-workspace-issue-properties.ts
+++ b/web/hooks/use-workspace-issue-properties.ts
@@ -1,12 +1,12 @@
 import useSWR from "swr";
-import { useCycle, useEstimate, useLabel, useModule, useProjectState } from "./store";
+import { useCycle, useProjectEstimates, useLabel, useModule, useProjectState } from "./store";
 
 export const useWorkspaceIssueProperties = (workspaceSlug: string | string[] | undefined) => {
   const { fetchWorkspaceLabels } = useLabel();
 
   const { fetchWorkspaceStates } = useProjectState();
 
-  const { fetchWorkspaceEstimates } = useEstimate();
+  const { getWorkspaceEstimates } = useProjectEstimates();
 
   const { fetchWorkspaceModules } = useModule();
 
@@ -43,7 +43,7 @@ export const useWorkspaceIssueProperties = (workspaceSlug: string | string[] | u
   // fetch workspace estimates
   useSWR(
     workspaceSlug ? `WORKSPACE_ESTIMATES_${workspaceSlug}` : null,
-    workspaceSlug ? () => fetchWorkspaceEstimates(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => getWorkspaceEstimates(workspaceSlug.toString()) : null,
     { revalidateIfStale: false, revalidateOnFocus: false }
   );
 };
diff --git a/web/layouts/auth-layout/project-wrapper.tsx b/web/layouts/auth-layout/project-wrapper.tsx
index 698c1801a..69e5b57f9 100644
--- a/web/layouts/auth-layout/project-wrapper.tsx
+++ b/web/layouts/auth-layout/project-wrapper.tsx
@@ -9,7 +9,7 @@ import { EmptyState, LogoSpinner } from "@/components/common";
 import {
   useEventTracker,
   useCycle,
-  useEstimate,
+  useProjectEstimates,
   useLabel,
   useMember,
   useModule,
@@ -44,7 +44,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
   } = useMember();
   const { fetchProjectStates } = useProjectState();
   const { fetchProjectLabels } = useLabel();
-  const { fetchProjectEstimates } = useEstimate();
+  const { getProjectEstimates } = useProjectEstimates();
   // router
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
@@ -80,7 +80,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
   // fetching project estimates
   useSWR(
     workspaceSlug && projectId ? `PROJECT_ESTIMATES_${workspaceSlug}_${projectId}` : null,
-    workspaceSlug && projectId ? () => fetchProjectEstimates(workspaceSlug.toString(), projectId.toString()) : null,
+    workspaceSlug && projectId ? () => getProjectEstimates(workspaceSlug.toString(), projectId.toString()) : null,
     { revalidateIfStale: false, revalidateOnFocus: false }
   );
   // fetching project cycles
diff --git a/web/lib/app-provider.tsx b/web/lib/app-provider.tsx
index 1044af012..779ce3cbf 100644
--- a/web/lib/app-provider.tsx
+++ b/web/lib/app-provider.tsx
@@ -43,8 +43,6 @@ export const AppProvider: FC<IAppProvider> = observer((props) => {
 
   return (
     <>
-      {/* TODO: Need to handle custom themes for toast */}
-      <Toast theme={resolveGeneralTheme(resolvedTheme)} />
       <InstanceWrapper>
         <StoreWrapper>
           <CrispWrapper user={currentUser}>
@@ -56,7 +54,11 @@ export const AppProvider: FC<IAppProvider> = observer((props) => {
               posthogAPIKey={config?.posthog_api_key || undefined}
               posthogHost={config?.posthog_host || undefined}
             >
-              <SWRConfig value={SWR_CONFIG}>{children}</SWRConfig>
+              <SWRConfig value={SWR_CONFIG}>
+                {/* TODO: Need to handle custom themes for toast */}
+                <Toast theme={resolveGeneralTheme(resolvedTheme)} />
+                {children}
+              </SWRConfig>
             </PostHogProvider>
           </CrispWrapper>
         </StoreWrapper>
diff --git a/web/next.config.js b/web/next.config.js
index 1cb49a40d..81c647a15 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -35,24 +35,24 @@ const nextConfig = {
       {
         source: "/accounts/sign-up",
         destination: "/sign-up",
-        permanent: true
+        permanent: true,
       },
       {
         source: "/sign-in",
         destination: "/",
-        permanent: true
+        permanent: true,
       },
       {
         source: "/register",
         destination: "/sign-up",
-        permanent: true
+        permanent: true,
       },
       {
         source: "/login",
         destination: "/",
-        permanent: true
-      }
-    ]
+        permanent: true,
+      },
+    ];
   },
   async rewrites() {
     const rewrites = [
@@ -66,13 +66,13 @@ const nextConfig = {
       },
     ];
     if (process.env.NEXT_PUBLIC_ADMIN_BASE_URL || process.env.NEXT_PUBLIC_ADMIN_BASE_PATH) {
-      const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || ""
-      const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || ""
-      const GOD_MODE_BASE_URL = ADMIN_BASE_URL + ADMIN_BASE_PATH
+      const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";
+      const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";
+      const GOD_MODE_BASE_URL = ADMIN_BASE_URL + ADMIN_BASE_PATH;
       rewrites.push({
         source: "/god-mode/:path*",
         destination: `${GOD_MODE_BASE_URL}/:path*`,
-      })
+      });
     }
     return rewrites;
   },
diff --git a/web/package.json b/web/package.json
index 72aa9d1e0..75f365860 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,12 +25,12 @@
     "@nivo/line": "0.80.0",
     "@nivo/pie": "0.80.0",
     "@nivo/scatterplot": "0.80.0",
+    "@plane/constants": "*",
     "@plane/document-editor": "*",
     "@plane/lite-text-editor": "*",
     "@plane/rich-text-editor": "*",
     "@plane/types": "*",
     "@plane/ui": "*",
-    "@plane/constants": "*",
     "@popperjs/core": "^2.11.8",
     "@sentry/nextjs": "^7.108.0",
     "axios": "^1.1.3",
@@ -70,17 +70,17 @@
     "@types/dompurify": "^3.0.5",
     "@types/js-cookie": "^3.0.2",
     "@types/lodash": "^4.14.202",
-    "@types/node": "18.0.6",
+    "@types/node": "18.16.1",
     "@types/nprogress": "^0.2.0",
-    "@types/react": "^18.2.42",
+    "@types/react": "^18.2.48",
     "@types/react-color": "^3.0.6",
-    "@types/react-dom": "^18.2.17",
+    "@types/react-dom": "^18.2.18",
     "@types/uuid": "^8.3.4",
     "@types/zxcvbn": "^4.4.4",
     "eslint-config-custom": "*",
     "prettier": "^3.2.5",
     "tailwind-config-custom": "*",
     "tsconfig": "*",
-    "typescript": "4.7.4"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/web/services/project/estimate.service.ts b/web/services/project/estimate.service.ts
index 0abc4cbd8..014f29252 100644
--- a/web/services/project/estimate.service.ts
+++ b/web/services/project/estimate.service.ts
@@ -1,5 +1,5 @@
 // types
-import { IEstimate } from "@plane/types";
+import { IEstimate, IEstimateFormData } from "@plane/types";
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
@@ -11,7 +11,7 @@ export class EstimateService extends APIService {
   }
 
   // fetching the estimates in workspace level
-  async fetchWorkspacesList(workspaceSlug: string): Promise<IEstimate[] | undefined> {
+  async fetchWorkspaceEstimates(workspaceSlug: string): Promise<IEstimate[] | undefined> {
     try {
       const { data } = await this.get(`/api/workspaces/${workspaceSlug}/estimates/`);
       return data || undefined;
@@ -20,7 +20,7 @@ export class EstimateService extends APIService {
     }
   }
 
-  async fetchAll(workspaceSlug: string, projectId: string): Promise<IEstimate[] | undefined> {
+  async fetchProjectEstimates(workspaceSlug: string, projectId: string): Promise<IEstimate[] | undefined> {
     try {
       const { data } = await this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`);
       return data || undefined;
@@ -29,7 +29,11 @@ export class EstimateService extends APIService {
     }
   }
 
-  async fetchById(workspaceSlug: string, projectId: string, estimateId: string): Promise<IEstimate | undefined> {
+  async fetchEstimateById(
+    workspaceSlug: string,
+    projectId: string,
+    estimateId: string
+  ): Promise<IEstimate | undefined> {
     try {
       const { data } = await this.get(
         `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`
@@ -40,7 +44,11 @@ export class EstimateService extends APIService {
     }
   }
 
-  async create(workspaceSlug: string, projectId: string, payload: Partial<IEstimate>): Promise<IEstimate | undefined> {
+  async createEstimate(
+    workspaceSlug: string,
+    projectId: string,
+    payload: IEstimateFormData
+  ): Promise<IEstimate | undefined> {
     try {
       const { data } = await this.post(`/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/`, payload);
       return data || undefined;
@@ -49,11 +57,11 @@ export class EstimateService extends APIService {
     }
   }
 
-  async update(
+  async updateEstimate(
     workspaceSlug: string,
     projectId: string,
     estimateId: string,
-    payload: Partial<IEstimate>
+    payload: IEstimateFormData
   ): Promise<IEstimate | undefined> {
     try {
       const { data } = await this.patch(
@@ -66,14 +74,20 @@ export class EstimateService extends APIService {
     }
   }
 
-  async remove(workspaceSlug: string, projectId: string, estimateId: string): Promise<void> {
-    try {
-      const { data } = await this.delete(
-        `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/`
-      );
-      return data || undefined;
-    } catch (error) {
-      throw error;
-    }
+  async removeEstimatePoint(
+    workspaceSlug: string,
+    projectId: string,
+    estimateId: string,
+    estimatePointId: string,
+    payload: { new_estimate_id: string | undefined }
+  ): Promise<any> {
+    return this.patch(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/estimates/${estimateId}/estimate-point/${estimatePointId}/`,
+      payload
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
   }
 }
diff --git a/web/store/estimate.store.ts b/web/store/estimate.store.ts
deleted file mode 100644
index 0bb35a23b..000000000
--- a/web/store/estimate.store.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import set from "lodash/set";
-import { observable, action, makeObservable, runInAction, computed } from "mobx";
-import { computedFn } from "mobx-utils";
-// types
-import { IEstimate, IEstimateFormData } from "@plane/types";
-// services
-import { ProjectEstimateService } from "@/services/project";
-// store
-import { RootStore } from "@/store/root.store";
-
-export interface IEstimateStore {
-  //Loaders
-  fetchedMap: Record<string, boolean>;
-  // observables
-  estimateMap: Record<string, IEstimate>;
-  // computed
-  areEstimatesEnabledForCurrentProject: boolean;
-  projectEstimates: IEstimate[] | null;
-  activeEstimateDetails: IEstimate | null;
-  // computed actions
-  areEstimatesEnabledForProject: (projectId: string) => boolean;
-  getEstimatePointValue: (estimateKey: number | null, projectId: string | null) => string;
-  getProjectEstimateById: (estimateId: string) => IEstimate | null;
-  getProjectActiveEstimateDetails: (projectId: string) => IEstimate | null;
-  // fetch actions
-  fetchProjectEstimates: (workspaceSlug: string, projectId: string) => Promise<IEstimate[]>;
-  fetchWorkspaceEstimates: (workspaceSlug: string) => Promise<IEstimate[]>;
-  // crud actions
-  createEstimate: (workspaceSlug: string, projectId: string, data: IEstimateFormData) => Promise<IEstimate>;
-  updateEstimate: (
-    workspaceSlug: string,
-    projectId: string,
-    estimateId: string,
-    data: IEstimateFormData
-  ) => Promise<IEstimate>;
-  deleteEstimate: (workspaceSlug: string, projectId: string, estimateId: string) => Promise<void>;
-}
-
-export class EstimateStore implements IEstimateStore {
-  // observables
-  estimateMap: Record<string, IEstimate> = {};
-  //loaders
-  fetchedMap: Record<string, boolean> = {};
-  // root store
-  rootStore;
-  // services
-  estimateService;
-
-  constructor(_rootStore: RootStore) {
-    makeObservable(this, {
-      // observables
-      estimateMap: observable,
-      fetchedMap: observable,
-      // computed
-      areEstimatesEnabledForCurrentProject: computed,
-      projectEstimates: computed,
-      activeEstimateDetails: computed,
-      // actions
-      fetchProjectEstimates: action,
-      fetchWorkspaceEstimates: action,
-      createEstimate: action,
-      updateEstimate: action,
-      deleteEstimate: action,
-    });
-
-    // root store
-    this.rootStore = _rootStore;
-    // services
-    this.estimateService = new ProjectEstimateService();
-  }
-
-  /**
-   * @description returns true if estimates are enabled for current project, false otherwise
-   */
-  get areEstimatesEnabledForCurrentProject() {
-    const currentProjectDetails = this.rootStore.projectRoot.project.currentProjectDetails;
-    if (!currentProjectDetails) return false;
-    return Boolean(currentProjectDetails?.estimate);
-  }
-
-  /**
-   * @description returns the list of estimates for current project
-   */
-  get projectEstimates() {
-    const projectId = this.rootStore.router.projectId;
-    const worksapceSlug = this.rootStore.router.workspaceSlug || "";
-    if (!projectId || !(this.fetchedMap[projectId] || this.fetchedMap[worksapceSlug])) return null;
-    return Object.values(this.estimateMap).filter((estimate) => estimate.project === projectId);
-  }
-
-  /**
-   * @description returns the active estimate details for current project
-   */
-  get activeEstimateDetails() {
-    const currentProjectDetails = this.rootStore.projectRoot.project.currentProjectDetails;
-    if (!currentProjectDetails || !currentProjectDetails?.estimate) return null;
-    return this.estimateMap?.[currentProjectDetails?.estimate || ""] || null;
-  }
-
-  /**
-   * @description returns true if estimates are enabled for a project using project id
-   * @param projectId
-   */
-  areEstimatesEnabledForProject = computedFn((projectId: string) => {
-    const projectDetails = this.rootStore.projectRoot.project.getProjectById(projectId);
-    if (!projectDetails) return false;
-    return Boolean(projectDetails.estimate) ?? false;
-  });
-
-  /**
-   * @description returns the point value for the given estimate key to display in the UI
-   */
-  getEstimatePointValue = computedFn((estimateKey: number | null, projectId: string | null) => {
-    if (estimateKey === null) return "None";
-    const activeEstimate = projectId ? this.getProjectActiveEstimateDetails(projectId) : this.activeEstimateDetails;
-    return activeEstimate?.points?.find((point) => point.key === estimateKey)?.value || "None";
-  });
-
-  /**
-   * @description returns the estimate details for the given estimate id
-   * @param estimateId
-   */
-  getProjectEstimateById = computedFn((estimateId: string) => {
-    if (!this.projectEstimates) return null;
-    const estimateInfo = this.estimateMap?.[estimateId] || null;
-    return estimateInfo;
-  });
-
-  /**
-   * @description returns the estimate details for the given estimate id
-   * @param projectId
-   */
-  getProjectActiveEstimateDetails = computedFn((projectId: string) => {
-    const projectDetails = this.rootStore.projectRoot.project?.getProjectById(projectId);
-    const worksapceSlug = this.rootStore.router.workspaceSlug || "";
-    if (!projectDetails || !projectDetails?.estimate || !(this.fetchedMap[projectId] || this.fetchedMap[worksapceSlug]))
-      return null;
-    return this.estimateMap?.[projectDetails?.estimate || ""] || null;
-  });
-
-  /**
-   * @description fetches the list of estimates for the given project
-   * @param workspaceSlug
-   * @param projectId
-   */
-  fetchProjectEstimates = async (workspaceSlug: string, projectId: string) =>
-    await this.estimateService.getEstimatesList(workspaceSlug, projectId).then((response) => {
-      runInAction(() => {
-        response.forEach((estimate) => {
-          set(this.estimateMap, estimate.id, estimate);
-        });
-        this.fetchedMap[projectId] = true;
-      });
-      return response;
-    });
-
-  /**
-   * @description fetches the list of estimates for the given project
-   * @param workspaceSlug
-   * @param projectId
-   */
-  fetchWorkspaceEstimates = async (workspaceSlug: string) =>
-    await this.estimateService.getWorkspaceEstimatesList(workspaceSlug).then((response) => {
-      runInAction(() => {
-        response.forEach((estimate) => {
-          set(this.estimateMap, estimate.id, estimate);
-        });
-        this.fetchedMap[workspaceSlug] = true;
-      });
-      return response;
-    });
-
-  /**
-   * @description creates a new estimate for the given project
-   * @param workspaceSlug
-   * @param projectId
-   * @param data
-   */
-  createEstimate = async (workspaceSlug: string, projectId: string, data: IEstimateFormData) =>
-    await this.estimateService.createEstimate(workspaceSlug, projectId, data).then((response) => {
-      const responseEstimate = {
-        ...response.estimate,
-        points: response.estimate_points,
-      };
-      runInAction(() => {
-        set(this.estimateMap, [responseEstimate.id], responseEstimate);
-      });
-      return response.estimate;
-    });
-
-  /**
-   * @description updates the given estimate for the given project
-   * @param workspaceSlug
-   * @param projectId
-   * @param estimateId
-   * @param data
-   */
-  updateEstimate = async (workspaceSlug: string, projectId: string, estimateId: string, data: IEstimateFormData) =>
-    await this.estimateService.patchEstimate(workspaceSlug, projectId, estimateId, data).then((response) => {
-      runInAction(() => {
-        set(this.estimateMap, estimateId, {
-          ...this.estimateMap[estimateId],
-          ...data.estimate,
-          points: [...data.estimate_points],
-        });
-      });
-      return response;
-    });
-
-  /**
-   * @description deletes the given estimate for the given project
-   * @param workspaceSlug
-   * @param projectId
-   * @param estimateId
-   */
-  deleteEstimate = async (workspaceSlug: string, projectId: string, estimateId: string) =>
-    await this.estimateService.deleteEstimate(workspaceSlug, projectId, estimateId).then(() => {
-      runInAction(() => {
-        delete this.estimateMap[estimateId];
-      });
-    });
-}
diff --git a/web/store/estimates/estimate-point.ts b/web/store/estimates/estimate-point.ts
index babc425ea..0b03c8841 100644
--- a/web/store/estimates/estimate-point.ts
+++ b/web/store/estimates/estimate-point.ts
@@ -1,5 +1,5 @@
 import { action, computed, makeObservable, observable } from "mobx";
-import { IEstimatePoint as IEstimatePointType } from "@plane/types";
+import { IEstimateFormData, IEstimate, IEstimatePoint as IEstimatePointType } from "@plane/types";
 // services
 import { EstimateService } from "@/services/project/estimate.service";
 // store
@@ -16,8 +16,7 @@ export interface IEstimatePoint extends IEstimatePointType {
   // computed
   asJson: IEstimatePointType;
   // actions
-  updateEstimatePoint: () => Promise<void>;
-  deleteEstimatePoint: () => Promise<void>;
+  updateEstimatePoint: (payload: IEstimateFormData) => Promise<void>;
 }
 
 export class EstimatePoint implements IEstimatePoint {
@@ -40,6 +39,7 @@ export class EstimatePoint implements IEstimatePoint {
 
   constructor(
     private store: RootStore,
+    private projectEstimate: IEstimate,
     private data: IEstimatePointType
   ) {
     makeObservable(this, {
@@ -61,7 +61,6 @@ export class EstimatePoint implements IEstimatePoint {
       asJson: computed,
       // actions
       updateEstimatePoint: action,
-      deleteEstimatePoint: action,
     });
     this.id = this.data.id;
     this.key = this.data.key;
@@ -97,19 +96,10 @@ export class EstimatePoint implements IEstimatePoint {
   }
 
   // actions
-  updateEstimatePoint = async () => {
+  updateEstimatePoint = async (payload: IEstimateFormData) => {
     try {
       const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId || !this.id) return undefined;
-    } catch (error) {
-      throw error;
-    }
-  };
-
-  deleteEstimatePoint = async () => {
-    try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId || !this.id) return;
+      if (!workspaceSlug || !projectId || !this.projectEstimate?.id || !this.id || !payload) return undefined;
     } catch (error) {
       throw error;
     }
diff --git a/web/store/estimates/estimate.ts b/web/store/estimates/estimate.ts
index 527a2aaa6..aa98b9cab 100644
--- a/web/store/estimates/estimate.ts
+++ b/web/store/estimates/estimate.ts
@@ -1,5 +1,7 @@
 import set from "lodash/set";
-import { action, computed, makeObservable, observable } from "mobx";
+import unset from "lodash/unset";
+import update from "lodash/update";
+import { action, computed, makeObservable, observable, runInAction } from "mobx";
 import { computedFn } from "mobx-utils";
 import {
   IEstimate as IEstimateType,
@@ -7,6 +9,7 @@ import {
   IProject,
   IWorkspace,
   TEstimateType,
+  IEstimateFormData,
 } from "@plane/types";
 // services
 import { EstimateService } from "@/services/project/estimate.service";
@@ -27,10 +30,9 @@ export interface IEstimate extends IEstimateType {
   asJson: IEstimateType;
   EstimatePointIds: string[] | undefined;
   estimatePointById: (estimateId: string) => IEstimatePointType | undefined;
-  // helper actions
   // actions
-  updateEstimate: (data: Partial<IEstimateType>) => Promise<IEstimateType | undefined>;
-  deleteEstimatePoint: (data: Partial<IEstimateType>) => Promise<void>;
+  updateEstimatePointSorting: (payload: IEstimateFormData) => Promise<void>;
+  deleteEstimatePoint: (estimatePointId: string) => Promise<void>;
 }
 
 export class Estimate implements IEstimate {
@@ -80,7 +82,7 @@ export class Estimate implements IEstimate {
       asJson: computed,
       EstimatePointIds: computed,
       // actions
-      updateEstimate: action,
+      updateEstimatePointSorting: action,
       deleteEstimatePoint: action,
     });
     this.id = this.data.id;
@@ -99,7 +101,7 @@ export class Estimate implements IEstimate {
 
     this.data.points?.forEach((estimationPoint) => {
       if (estimationPoint.id)
-        set(this.estimatePoints, [estimationPoint.id], new EstimatePoint(this.store, estimationPoint));
+        set(this.estimatePoints, [estimationPoint.id], new EstimatePoint(this.store, this.data, estimationPoint));
     });
     // service
     this.service = new EstimateService();
@@ -141,26 +143,37 @@ export class Estimate implements IEstimate {
   });
 
   // actions
-  updateEstimate = async (estimatePoint: Partial<IEstimateType>) => {
+  updateEstimatePointSorting = async (payload: IEstimateFormData) => {
     try {
       const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId || !this.id) return undefined;
+      if (!workspaceSlug || !projectId || !this.id || !payload) return;
 
-      Object.entries(estimatePoint ?? {}).forEach(([key, value]) => {
-        if (!key || !value) return;
-        set(this, key, value);
+      // make update estimation request
+
+      // runInAction(() => {
+      //   this.points = payload.estimate_points;
+      //   this.data.points = payload.estimate_points;
+      // });
+    } catch (error) {
+      throw error;
+    }
+  };
+
+  deleteEstimatePoint = async (estimatePointId: string) => {
+    try {
+      const { workspaceSlug, projectId } = this.store.router;
+      if (!workspaceSlug || !projectId || !estimatePointId) return;
+
+      // make delete estimation request
+
+      runInAction(() => {
+        update(this, "points", (estimationPoints = []) =>
+          estimationPoints.filter((point: IEstimatePointType) => point.id !== estimatePointId)
+        );
+        unset(this.estimatePoints, [estimatePointId]);
       });
     } catch (error) {
       throw error;
     }
   };
-
-  deleteEstimatePoint = async () => {
-    try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId || !this.id) return;
-    } catch (error) {
-      throw error;
-    }
-  };
 }
diff --git a/web/store/estimates/project-estimate.store.ts b/web/store/estimates/project-estimate.store.ts
index f3f153d2c..435dab0e2 100644
--- a/web/store/estimates/project-estimate.store.ts
+++ b/web/store/estimates/project-estimate.store.ts
@@ -1,9 +1,8 @@
 import set from "lodash/set";
-import unset from "lodash/unset";
 import update from "lodash/update";
-import { action, computed, makeObservable, observable } from "mobx";
+import { action, computed, makeObservable, observable, runInAction } from "mobx";
 import { computedFn } from "mobx-utils";
-import { IEstimate as IEstimateType } from "@plane/types";
+import { IEstimate as IEstimateType, IEstimateFormData } from "@plane/types";
 // services
 import { EstimateService } from "@/services/project/estimate.service";
 // store
@@ -22,14 +21,23 @@ export interface IProjectEstimateStore {
   estimates: Record<string, IEstimate>;
   error: TErrorCodes | undefined;
   // computed
+  areEstimateEnabledByProjectId: (projectId: string) => boolean;
   projectEstimateIds: string[] | undefined;
+  estimateIdsByProjectId: (projectId: string) => string[] | undefined;
   estimateById: (estimateId: string) => IEstimate | undefined;
   // actions
-  getWorkspaceAllEstimates: () => Promise<IEstimateType[] | undefined>;
-  getAllEstimates: () => Promise<IEstimateType[] | undefined>;
-  getEstimateById: (estimateId: string) => Promise<IEstimateType | undefined>;
-  createEstimate: (data: Partial<IEstimateType>) => Promise<IEstimateType | undefined>;
-  deleteEstimate: (estimateId: string) => Promise<void>;
+  getWorkspaceEstimates: (workspaceSlug: string, loader?: TEstimateLoader) => Promise<IEstimateType[] | undefined>;
+  getProjectEstimates: (
+    workspaceSlug: string,
+    projectId: string,
+    loader?: TEstimateLoader
+  ) => Promise<IEstimateType[] | undefined>;
+  getEstimateById: (workspaceSlug: string, projectId: string, estimateId: string) => Promise<IEstimateType | undefined>;
+  createEstimate: (
+    workspaceSlug: string,
+    projectId: string,
+    data: IEstimateFormData
+  ) => Promise<IEstimateType | undefined>;
 }
 
 export class ProjectEstimateStore implements IProjectEstimateStore {
@@ -49,28 +57,56 @@ export class ProjectEstimateStore implements IProjectEstimateStore {
       // computed
       projectEstimateIds: computed,
       // actions
-      getWorkspaceAllEstimates: action,
-      getAllEstimates: action,
+      getWorkspaceEstimates: action,
+      getProjectEstimates: action,
       getEstimateById: action,
       createEstimate: action,
-      deleteEstimate: action,
     });
     // service
     this.service = new EstimateService();
   }
 
   // computed
-  get projectEstimateIds() {
+  /**
+   * @description get estimates are enabled in the project or not
+   * @returns { boolean }
+   */
+  areEstimateEnabledByProjectId = computedFn((projectId: string) => {
+    if (!projectId) return false;
+    const projectDetails = this.store.projectRoot.project.getProjectById(projectId);
+    if (!projectDetails) return false;
+    return Boolean(projectDetails.estimate) || false;
+  });
+
+  /**
+   * @description get all estimate ids for a project
+   * @returns { string[] | undefined }
+   */
+  get projectEstimateIds(): string[] | undefined {
     const { projectId } = this.store.router;
     if (!projectId) return undefined;
-
     const projectEstimatesIds = Object.values(this.estimates || {})
       .filter((p) => p.project === projectId)
       .map((p) => p.id && p != undefined) as string[];
-
     return projectEstimatesIds ?? undefined;
   }
 
+  /**
+   * @description get all estimate ids for a project
+   * @returns { string[] | undefined }
+   */
+  estimateIdsByProjectId = computedFn((projectId: string) => {
+    if (!projectId) return undefined;
+    const projectEstimatesIds = Object.values(this.estimates || {})
+      .filter((p) => p.project === projectId)
+      .map((p) => p.id && p != undefined) as string[];
+    return projectEstimatesIds ?? undefined;
+  });
+
+  /**
+   * @description get estimate by id
+   * @returns { IEstimate | undefined }
+   */
   estimateById = computedFn((estimateId: string) => {
     if (!estimateId) return undefined;
     return this.estimates[estimateId] ?? undefined;
@@ -78,24 +114,29 @@ export class ProjectEstimateStore implements IProjectEstimateStore {
 
   // actions
   /**
-   * @description fetch all estimates for a project
+   * @description fetch all estimates for a workspace
    * @returns { IEstimateType[] | undefined }
    */
-  getWorkspaceAllEstimates = async (): Promise<IEstimateType[] | undefined> => {
+  getWorkspaceEstimates = async (
+    workspaceSlug: string,
+    loader: TEstimateLoader = "mutation-loader"
+  ): Promise<IEstimateType[] | undefined> => {
     try {
-      const { workspaceSlug } = this.store.router;
-      if (!workspaceSlug) return;
-
       this.error = undefined;
-      const estimates = await this.service.fetchWorkspacesList(workspaceSlug);
+      if (!this.projectEstimateIds) this.loader = loader ? loader : "init-loader";
 
-      if (estimates && estimates.length > 0)
-        estimates.forEach((estimate) => {
-          if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+      const estimates = await this.service.fetchWorkspaceEstimates(workspaceSlug);
+      if (estimates && estimates.length > 0) {
+        runInAction(() => {
+          estimates.forEach((estimate) => {
+            if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+          });
         });
+      }
 
       return estimates;
     } catch (error) {
+      this.loader = undefined;
       this.error = {
         status: "error",
         message: "Error fetching estimates",
@@ -103,21 +144,31 @@ export class ProjectEstimateStore implements IProjectEstimateStore {
     }
   };
 
-  getAllEstimates = async (): Promise<IEstimateType[] | undefined> => {
+  /**
+   * @description fetch all estimates for a project
+   * @returns { IEstimateType[] | undefined }
+   */
+  getProjectEstimates = async (
+    workspaceSlug: string,
+    projectId: string,
+    loader: TEstimateLoader = "mutation-loader"
+  ): Promise<IEstimateType[] | undefined> => {
     try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId) return;
-
       this.error = undefined;
-      const estimates = await this.service.fetchAll(workspaceSlug, projectId);
+      if (!this.projectEstimateIds) this.loader = loader ? loader : "init-loader";
 
-      if (estimates && estimates.length > 0)
-        estimates.forEach((estimate) => {
-          if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+      const estimates = await this.service.fetchProjectEstimates(workspaceSlug, projectId);
+      if (estimates && estimates.length > 0) {
+        runInAction(() => {
+          estimates.forEach((estimate) => {
+            if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+          });
         });
+      }
 
       return estimates;
     } catch (error) {
+      this.loader = undefined;
       this.error = {
         status: "error",
         message: "Error fetching estimates",
@@ -130,19 +181,24 @@ export class ProjectEstimateStore implements IProjectEstimateStore {
    * @param { string } estimateId
    * @returns IEstimateType | undefined
    */
-  getEstimateById = async (estimateId: string): Promise<IEstimateType | undefined> => {
+  getEstimateById = async (
+    workspaceSlug: string,
+    projectId: string,
+    estimateId: string
+  ): Promise<IEstimateType | undefined> => {
     try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId) return;
-
       this.error = undefined;
-      const estimate = await this.service.fetchById(workspaceSlug, projectId, estimateId);
 
-      if (estimate && estimate.id)
-        update(this.estimates, [estimate.id], (estimateStore) => {
-          if (estimateStore) estimateStore.updateEstimate(estimate);
-          else return new Estimate(this.store, estimate);
+      const estimate = await this.service.fetchEstimateById(workspaceSlug, projectId, estimateId);
+      if (estimate) {
+        runInAction(() => {
+          if (estimate.id)
+            update(this.estimates, [estimate.id], (estimateStore) => {
+              if (estimateStore) estimateStore.updateEstimate(estimate);
+              else return new Estimate(this.store, estimate);
+            });
         });
+      }
 
       return estimate;
     } catch (error) {
@@ -155,48 +211,30 @@ export class ProjectEstimateStore implements IProjectEstimateStore {
 
   /**
    * @description create an estimate for a project
-   * @param { Partial<IEstimateType> } data
+   * @param { Partial<IEstimateType> } payload
    * @returns
    */
-  createEstimate = async (data: Partial<IEstimateType>): Promise<IEstimateType | undefined> => {
+  createEstimate = async (
+    workspaceSlug: string,
+    projectId: string,
+    payload: IEstimateFormData
+  ): Promise<IEstimateType | undefined> => {
     try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId) return;
-
       this.error = undefined;
-      const estimate = await this.service.create(workspaceSlug, projectId, data);
 
-      if (estimate && estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+      const estimate = await this.service.createEstimate(workspaceSlug, projectId, payload);
+      if (estimate) {
+        runInAction(() => {
+          if (estimate.id) set(this.estimates, [estimate.id], new Estimate(this.store, estimate));
+        });
+      }
 
       return estimate;
     } catch (error) {
-      console.error("Error creating estimate");
       this.error = {
         status: "error",
         message: "Error creating estimate",
       };
     }
   };
-
-  /**
-   * @description delete an estimate for a project
-   * @param { string } estimateId
-   * @returns void
-   */
-  deleteEstimate = async (estimateId: string): Promise<void> => {
-    try {
-      const { workspaceSlug, projectId } = this.store.router;
-      if (!workspaceSlug || !projectId) return;
-
-      this.error = undefined;
-      await this.service.remove(workspaceSlug, projectId, estimateId);
-      unset(this.estimates, [estimateId]);
-    } catch (error) {
-      console.error("Error deleting estimate");
-      this.error = {
-        status: "error",
-        message: "Error deleting estimate",
-      };
-    }
-  };
 }
diff --git a/web/store/issue/issue-details/sub_issues.store.ts b/web/store/issue/issue-details/sub_issues.store.ts
index bb1cf922c..b43e4d487 100644
--- a/web/store/issue/issue-details/sub_issues.store.ts
+++ b/web/store/issue/issue-details/sub_issues.store.ts
@@ -346,7 +346,10 @@ export class IssueSubIssuesStore implements IIssueSubIssuesStore {
           // fetching other project modules
           this.rootIssueDetailStore.rootIssueStore.rootStore.module.fetchModules(workspaceSlug, projectId);
           // fetching other project estimates
-          this.rootIssueDetailStore.rootIssueStore.rootStore.estimate.fetchProjectEstimates(workspaceSlug, projectId);
+          this.rootIssueDetailStore.rootIssueStore.rootStore.projectEstimate.getProjectEstimates(
+            workspaceSlug,
+            projectId
+          );
         }
       }
     } catch (error) {
diff --git a/web/store/root.store.ts b/web/store/root.store.ts
index 45fb2fd21..e2c37431a 100644
--- a/web/store/root.store.ts
+++ b/web/store/root.store.ts
@@ -4,7 +4,6 @@ import { CommandPaletteStore, ICommandPaletteStore } from "./command-palette.sto
 import { CycleStore, ICycleStore } from "./cycle.store";
 import { CycleFilterStore, ICycleFilterStore } from "./cycle_filter.store";
 import { DashboardStore, IDashboardStore } from "./dashboard.store";
-import { EstimateStore, IEstimateStore } from "./estimate.store";
 import { IProjectEstimateStore, ProjectEstimateStore } from "./estimates/project-estimate.store";
 import { EventTrackerStore, IEventTrackerStore } from "./event-tracker.store";
 import { GlobalViewStore, IGlobalViewStore } from "./global-view.store";
@@ -39,7 +38,6 @@ export class RootStore {
   issue: IIssueRootStore;
   state: IStateStore;
   label: ILabelStore;
-  estimate: IEstimateStore;
   dashboard: IDashboardStore;
   projectPages: IProjectPageStore;
   router: IRouterStore;
@@ -66,7 +64,6 @@ export class RootStore {
     this.issue = new IssueRootStore(this);
     this.state = new StateStore(this);
     this.label = new LabelStore(this);
-    this.estimate = new EstimateStore(this);
     this.dashboard = new DashboardStore(this);
     this.commandPalette = new CommandPaletteStore();
     this.theme = new ThemeStore(this);
@@ -95,7 +92,6 @@ export class RootStore {
     this.issue = new IssueRootStore(this);
     this.state = new StateStore(this);
     this.label = new LabelStore(this);
-    this.estimate = new EstimateStore(this);
     this.dashboard = new DashboardStore(this);
     this.router = new RouterStore();
     this.commandPalette = new CommandPaletteStore();
diff --git a/yarn.lock b/yarn.lock
index 436886520..65a1e1c8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2648,55 +2648,55 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958"
   integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==
 
-"@storybook/addon-actions@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-8.1.2.tgz#d3fc0d19581092dd51f93b58c4a0725d20a51ec5"
-  integrity sha512-EW8sYgA1vpn67pTheBjfLCfPO82w0jMkKYFDFMMvxVoEDbJ3fgsUDDd058zBBFiDtnngv3VUrXASPTxK51F2mQ==
+"@storybook/addon-actions@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-8.1.3.tgz#9312e87cdf4f1a07ddc2a6ccdb28d90649c01c6e"
+  integrity sha512-XG6clFT/lPOHEm/tHdWO3E5G28HIock2272BZNr15+DqVTRYyGRhuFQKxPb+CdRWCpT1VQnWS+L9S1+95wDlJw==
   dependencies:
-    "@storybook/core-events" "8.1.2"
+    "@storybook/core-events" "8.1.3"
     "@storybook/global" "^5.0.0"
     "@types/uuid" "^9.0.1"
     dequal "^2.0.2"
     polished "^4.2.2"
     uuid "^9.0.0"
 
-"@storybook/addon-backgrounds@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-8.1.2.tgz#b26edf16300396808d59a9309f7b33620f3b42bc"
-  integrity sha512-zCSDQ6a0od1Na1fzBcwCtxykKBLi97eKdVBTCVWQ3IPztl+WODO306PfE4vC9QV8icq8BPgPp4MsKuNLx1uFxQ==
+"@storybook/addon-backgrounds@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-8.1.3.tgz#7f6e31d812e3a1ba13500bd614ea46d0d5bab990"
+  integrity sha512-XBCDugJWCzJOMhkFPVFCtGCtABYr1LDUot9xfOWPwQbshGwsdSf++TcayUbJKI5MJRuNYmnG4V0YYoRxVkDDVA==
   dependencies:
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-controls@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-8.1.2.tgz#21eded36d46acc1919718b8722ec15725810db0e"
-  integrity sha512-2+dy3wRfGjiXmbw/3Fg8wnkO5kLycl9g37m/kCKsJZ10pFjq7xInNP6QKUz0yCM7BMdO+NlDii/clUAHYQ/puA==
+"@storybook/addon-controls@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-8.1.3.tgz#842cc6b1f025fa9408bb833a17cd3fab0a9df1e1"
+  integrity sha512-3/w5/AVrA+U3A5VtYmqJoj2kCu6qVLB6ycsusxsAlRKkXTRO5HvbK1Ndm8oPNaKaJT4W22VIVem6SyVMiNq4Kw==
   dependencies:
-    "@storybook/blocks" "8.1.2"
+    "@storybook/blocks" "8.1.3"
     dequal "^2.0.2"
     lodash "^4.17.21"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-8.1.2.tgz#8d6e6d0b634d4753d90a3261b34641455d027b2a"
-  integrity sha512-wwzvcE/d2ZBmUQY1gMJMb/cNw4CvckFl4pFq3cGipn3QnZzYIad9oQxMIUtYXCyHw3oguajaw6qYLZzkJEAvWg==
+"@storybook/addon-docs@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-8.1.3.tgz#914153bb2f9e77978892bba9f725ed7a56e0ffac"
+  integrity sha512-oASBnWOT9bUXo3rWDH8Ph8xWvi7cia1Bn/aoA2YlkJIC9R99FLQbEeKOJgcANWBC05YnLF75k4AOZOLqLPMVxQ==
   dependencies:
     "@babel/core" "^7.24.4"
     "@mdx-js/react" "^3.0.0"
-    "@storybook/blocks" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/components" "8.1.2"
-    "@storybook/csf-plugin" "8.1.2"
-    "@storybook/csf-tools" "8.1.2"
+    "@storybook/blocks" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/components" "8.1.3"
+    "@storybook/csf-plugin" "8.1.3"
+    "@storybook/csf-tools" "8.1.3"
     "@storybook/global" "^5.0.0"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
-    "@storybook/react-dom-shim" "8.1.2"
-    "@storybook/theming" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
+    "@storybook/react-dom-shim" "8.1.3"
+    "@storybook/theming" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/react" "^16.8.0 || ^17.0.0 || ^18.0.0"
     fs-extra "^11.1.0"
     react "^16.8.0 || ^17.0.0 || ^18.0.0"
@@ -2706,72 +2706,72 @@
     ts-dedent "^2.0.0"
 
 "@storybook/addon-essentials@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-8.1.2.tgz#53f297360e604509cda76e38303ca4acd9435d73"
-  integrity sha512-mX8Loni7bRQ6IVkhJzIcgBtpaZKAxF8OGPcqG/J4DMulH0wv58vKBCygyCc2XXOG3K1fyggGN5KgWa+w6X3Anw==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-8.1.3.tgz#3c2e2764112543e31208071f133c73170162c893"
+  integrity sha512-Ziv7jEM7f37JNDkd7+x5UCZWBHv7HgQ2LuUEV7mv5FtBbT+9ors/155PfzBLOpDjGQytVKiHuwChsbBvfIqdJg==
   dependencies:
-    "@storybook/addon-actions" "8.1.2"
-    "@storybook/addon-backgrounds" "8.1.2"
-    "@storybook/addon-controls" "8.1.2"
-    "@storybook/addon-docs" "8.1.2"
-    "@storybook/addon-highlight" "8.1.2"
-    "@storybook/addon-measure" "8.1.2"
-    "@storybook/addon-outline" "8.1.2"
-    "@storybook/addon-toolbars" "8.1.2"
-    "@storybook/addon-viewport" "8.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/manager-api" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
+    "@storybook/addon-actions" "8.1.3"
+    "@storybook/addon-backgrounds" "8.1.3"
+    "@storybook/addon-controls" "8.1.3"
+    "@storybook/addon-docs" "8.1.3"
+    "@storybook/addon-highlight" "8.1.3"
+    "@storybook/addon-measure" "8.1.3"
+    "@storybook/addon-outline" "8.1.3"
+    "@storybook/addon-toolbars" "8.1.3"
+    "@storybook/addon-viewport" "8.1.3"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/manager-api" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-highlight@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-8.1.2.tgz#462c434263ef21d6c087b4063cd586bd34b82aa9"
-  integrity sha512-1PDE2RRV33oMGZJ4ZJ9GbLlsWEIq/opEfbSa9cy1C4K0mcfLtdSbDk5bT23wfU78HFYF2q5+aJ7jVFwHJjueTA==
+"@storybook/addon-highlight@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-8.1.3.tgz#aa05025d20d8ec9f82a21021e746ec1caaaff3f6"
+  integrity sha512-X+sTpav2GDOY5M9M+n4nFrPMAtnZYxjh4gULl1IAWDcDt2zgiu5wqB6tWtz+qmLla8jdwkdpb5GmuEYuayngDQ==
   dependencies:
     "@storybook/global" "^5.0.0"
 
 "@storybook/addon-interactions@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-8.1.2.tgz#e1ff6cd4036d31b417b8831a96f519676692b64f"
-  integrity sha512-x8TCWVMOqcwQEIgkWeDaPQs4pYFNf2qvoq5E8xLweCbHY6ciwU/IOYNs4p7r4qwzQvUteyHCBYnKIXSbH8xhiA==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-8.1.3.tgz#0c4f1ae0d0af3154ff57e3e00bbfb9b3d6d6e834"
+  integrity sha512-+4+fGo1nSr5Re48oW2RBlXS8Jq7ZtHNXJ2dSXkxYE1uXLu8K4/a4WvtvAVPZK93+qKP1T2hTLL7eOSApVnUvJQ==
   dependencies:
     "@storybook/global" "^5.0.0"
-    "@storybook/instrumenter" "8.1.2"
-    "@storybook/test" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/instrumenter" "8.1.3"
+    "@storybook/test" "8.1.3"
+    "@storybook/types" "8.1.3"
     polished "^4.2.2"
     ts-dedent "^2.2.0"
 
 "@storybook/addon-links@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-8.1.2.tgz#b967858178d1bcc80083bb2dc314307c6e23b35f"
-  integrity sha512-l+Q1LqyPhQ1n4vGQF95vkH9ImJUt1eY0MU+mlwlMHoMDdcFkUqzBxx5NwhrhbvdZK/yfxt9gjsx62k9RYDNKjA==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-8.1.3.tgz#2cdda7b3e019b08480812b4bf71df0ca1ef83744"
+  integrity sha512-WwXrSDmtpjDJvUMMKbQSio7w5yVu51Gndamf/EkkRXGMauBAm7rW5M/S1Rky3ZPhHt9a6ByI51GpGMDrNFLoRQ==
   dependencies:
     "@storybook/csf" "^0.1.7"
     "@storybook/global" "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-measure@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-8.1.2.tgz#9d0c0e59f115e067a868ad3c5bfa613aa2fa969d"
-  integrity sha512-Wer5TQ6smPiJpevvnUr6DELxd7bNvCL1xOeaAI8/0g186TKlaaSam2GapIErWXQfzuh7dYnCVXxiTOiayUv3UQ==
+"@storybook/addon-measure@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-8.1.3.tgz#c5ef560c7422c3f31f05bb968965cf59ae7da4db"
+  integrity sha512-i5A9RDKh6Bg3j+9S3fjZQtBe827Svemz0VFe00efaUrCj9tuNPRD/ggFiToUa4Q+qtqT8K1mLeg6IsTfl6LR8A==
   dependencies:
     "@storybook/global" "^5.0.0"
     tiny-invariant "^1.3.1"
 
 "@storybook/addon-onboarding@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-onboarding/-/addon-onboarding-8.1.2.tgz#bf1703ecd9db56d673f1e73cc49c3785e47c7aed"
-  integrity sha512-z5jokyfCA4tJMv/kl7MeimxezHibcX+ICH2tausV3rRmtkDxVqp8LmbCktH5hPST7VX+qBVsQyqGDmpEXqWkog==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-onboarding/-/addon-onboarding-8.1.3.tgz#4e6bea1776be6e7a291b4461c7cd802b16bf93ae"
+  integrity sha512-xL6UVK6kC6rJzhR0KVXLtN7bWdtd9+uDUyF0QFtW32KpYsa2d9VMo29Pxx6Ht9Kbchn2SUXS0K27BR0YJA6aFA==
   dependencies:
     react-confetti "^6.1.0"
 
-"@storybook/addon-outline@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-8.1.2.tgz#645c18cd948cc72bb36de277d97ba3a97377e449"
-  integrity sha512-4jnUIU4dMDGbgevPQTXoe11WVAOxwhMkFgq9URZjV553Rhpu6g2DfXLJEB45j3uh7AksyD6gX2/v8tXoYeKUoQ==
+"@storybook/addon-outline@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-8.1.3.tgz#dcf0104605257ac6f350a0ed623267b1c212083b"
+  integrity sha512-4kz2WfxwRUBOaNuESlFbJs3WHjHhIAvMRikVzzZLbY0U3gM5Tz5LnjuPw/oIGts/+bXb6/S4vwO8o3xO1Ghnzg==
   dependencies:
     "@storybook/global" "^5.0.0"
     ts-dedent "^2.0.0"
@@ -2783,15 +2783,15 @@
   dependencies:
     "@storybook/node-logger" "^8.0.0-alpha.10"
 
-"@storybook/addon-toolbars@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-8.1.2.tgz#8e6a85338b9fec8777d08f23ffef218ce220d874"
-  integrity sha512-Nim7ndZLEzt2NtSzZFZIZ4EKSxAzSnIgX8U3gMDyVPhITXOxVy2kPeYYCcRynZOjDa7MXbin7NaV+GH82RfZKw==
+"@storybook/addon-toolbars@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-8.1.3.tgz#14d83bb446b60cc712db9be2f05bc17af5bdba91"
+  integrity sha512-cJmYRp8thYcaFXp/81nAODH4xePkkhmr+pSevKyHInUWL/L0/ZiE7DMHPsFABj7QKqbuy1dn8WqIRgYDjKDCYg==
 
-"@storybook/addon-viewport@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-8.1.2.tgz#ed489721867c04097dc73c714230637ab82b8c71"
-  integrity sha512-a+VgyH5lWQzB+e9kzg06lKxDFFrAksdDszmeTWG5d6CG9uXWQ95LqFTfGp25sQRRpcBth5i0VJnGN8fNiSKblQ==
+"@storybook/addon-viewport@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-8.1.3.tgz#cae6c4235771891eae1737d82e395216765e5087"
+  integrity sha512-zronhXim/TjSYqA63m7r9plqP+QX4p6jWLkc5y6mkqLY/pIaMnvFg4aCA6Nv1HL96krU9WvT96AIqbIsXNlTTg==
   dependencies:
     memoizerific "^1.11.3"
 
@@ -2803,23 +2803,23 @@
     "@swc/core" "^1.3.102"
     swc-loader "^0.2.3"
 
-"@storybook/blocks@8.1.2", "@storybook/blocks@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-8.1.2.tgz#1fb868499d3d62390264aa1018e650df95984b8c"
-  integrity sha512-Juk4xkRdjxVDeLdx0w1t6BafxqF6R64QVoehcjO50zHUixQEJdmFopxUgBFFRPTdisz7uNNFSDH3LOYCrKdMVQ==
+"@storybook/blocks@8.1.3", "@storybook/blocks@^8.1.1":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-8.1.3.tgz#6943aeffb4dbbc0722a8849bf62e715531c0bdfe"
+  integrity sha512-Ul8rsUcgsnizsYuWVgoybP4pGeqq5FV0jcwA00muXWs3ubPYKrKrhLhfjxkb8gi+7YikpbinPKWmlrQK1Fn3MQ==
   dependencies:
-    "@storybook/channels" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/components" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/channels" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/components" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/csf" "^0.1.7"
-    "@storybook/docs-tools" "8.1.2"
+    "@storybook/docs-tools" "8.1.3"
     "@storybook/global" "^5.0.0"
     "@storybook/icons" "^1.2.5"
-    "@storybook/manager-api" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
-    "@storybook/theming" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/manager-api" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
+    "@storybook/theming" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/lodash" "^4.14.167"
     color-convert "^2.0.1"
     dequal "^2.0.2"
@@ -2833,15 +2833,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/builder-manager@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-8.1.2.tgz#ea51be988b223cf7dcf90fea8f77ce5594f6ff9a"
-  integrity sha512-cOdfSUY6vtZvJaSK1htx4aNmCLldPS7gFTBoooj3oMv7SyP3c3T53NuB+RcYpMqAUtngjLnTcl+tQ9JR/H5meA==
+"@storybook/builder-manager@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-8.1.3.tgz#f48905fb967866734b24a9f1592e72bd446acbc4"
+  integrity sha512-VIYgF6PreiteJMGlz716P27yyL/JF1dR7M2htVJij5IP2X6HUgyzFXScElKljX9fETq7vig+UZWksZ2M2Q9dYg==
   dependencies:
     "@fal-works/esbuild-plugin-global-externals" "^2.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/manager" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/manager" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
     "@types/ejs" "^3.1.1"
     "@yarnpkg/esbuild-plugin-pnp" "^3.0.0-rc.10"
     browser-assert "^1.2.1"
@@ -2853,19 +2853,19 @@
     process "^0.11.10"
     util "^0.12.4"
 
-"@storybook/builder-webpack5@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-8.1.2.tgz#6b245548f2b7c54f83bdf5294a63d9e306289805"
-  integrity sha512-viLRvTXvXUj3MeO7CNk9nOde5Q/QLxE4EuTExIaJK3OB637bptabtVnbNsOCyhilHK7g1Jww9rdirXVosPUXjg==
+"@storybook/builder-webpack5@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-8.1.3.tgz#9e054809b5c495eba7e810348668b0df849d5084"
+  integrity sha512-QtlvI9LgamKQC+9yxbx6deIF5hXvrWQRuta2TUAfQ3wTrOXosFQDyZl44C31z28ma4XjuAacWOgZNUS4DPFpsA==
   dependencies:
-    "@storybook/channels" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/core-events" "8.1.2"
-    "@storybook/core-webpack" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/preview" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
+    "@storybook/channels" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/core-events" "8.1.3"
+    "@storybook/core-webpack" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/preview" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
     "@types/node" "^18.0.0"
     "@types/semver" "^7.3.4"
     browser-assert "^1.2.1"
@@ -2893,33 +2893,33 @@
     webpack-hot-middleware "^2.25.1"
     webpack-virtual-modules "^0.5.0"
 
-"@storybook/channels@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-8.1.2.tgz#f166393214be061f074ab88b3d240d67b21d7b8c"
-  integrity sha512-ChWKPCDZ4VVBpulJsZ+RQiPi4NVm6tb0FJwjEcMskxl4Nx2x4+rxLrZHrsZHWXsH5uJctSEjmmvEn1QdjVKMPQ==
+"@storybook/channels@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-8.1.3.tgz#34afeecaf6278e7d11359182f5cf07f054f0ab85"
+  integrity sha512-iDoHFX3ty7vhSXegFRevJkQ6cV+QQ1JjDnoXK/SHeloMT26sn5gPtetn3ET9+6ZoFkU05Pf5d0DoywVOfumfcg==
   dependencies:
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/global" "^5.0.0"
     telejson "^7.2.0"
     tiny-invariant "^1.3.1"
 
-"@storybook/cli@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-8.1.2.tgz#ee6e5d04b5f3cd8c301115cbf0c989c06f7cda1f"
-  integrity sha512-gynn8LjmqJmAfaMNAf8h0V+RFdTo10+x4x6yiCy/eI/Yct0B5ke9MPzdKHocMhBLv9EDNz1ealwjsvR7dmjy2w==
+"@storybook/cli@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-8.1.3.tgz#5f2ee1afbfc25b1ba86e2a73fb3bd427048c7b3f"
+  integrity sha512-eqzjy7YOIF0WkeUPT5Mv+WKibk3z+IfP0voTKIWzYKAqZ8sD36NQV/lE7bHy0JAPw+rfw1Fq0gMOiFVcx3ZaUQ==
   dependencies:
     "@babel/core" "^7.24.4"
     "@babel/types" "^7.24.0"
     "@ndelangen/get-tarball" "^3.0.7"
-    "@storybook/codemod" "8.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/core-events" "8.1.2"
-    "@storybook/core-server" "8.1.2"
-    "@storybook/csf-tools" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/telemetry" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/codemod" "8.1.3"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/core-events" "8.1.3"
+    "@storybook/core-server" "8.1.3"
+    "@storybook/csf-tools" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/telemetry" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/semver" "^7.3.4"
     "@yarnpkg/fslib" "2.10.3"
     "@yarnpkg/libzip" "2.3.0"
@@ -2946,25 +2946,25 @@
     tiny-invariant "^1.3.1"
     ts-dedent "^2.0.0"
 
-"@storybook/client-logger@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-8.1.2.tgz#32bca1651892b18edd627d2835f44b50bee0d19c"
-  integrity sha512-2kiXh0CE2IJpV++r0sGknMVMjAiT/tQe16FlGHOh52XppUz7slQVy/W/nPhVKvcbdThSQd0kYFR9r3XmAT1LSQ==
+"@storybook/client-logger@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-8.1.3.tgz#dcf6e7dc3d5757bcf2f7aa578a40aa9438c998f5"
+  integrity sha512-dX1jZ+HhJ8hVhAKHQ8gs/FalHjIGo5j1Xk+2UqdsGjLoBlwHIHfHzkVbzrc/gCxxXL0juisk7BzbXaz7lME0KA==
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/codemod@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-8.1.2.tgz#7a6055d41a38d226ae6c6b5dc2542aba4b5dbf13"
-  integrity sha512-kcJjq5BBxxUBVsOxBnwwkqVPm/zdWMbr5VOjmZinqPtPA1slFQxbfRenD77l6icT15InZqbRXwkp1+G8oYDVGA==
+"@storybook/codemod@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-8.1.3.tgz#1b59e5c4de57049e51688f52e9553a98775efc1f"
+  integrity sha512-U21HQICKKm/xsfLKEODDphJJiBkzq5wFZzKN2DyMPd3vOfLpCWcaPsO9Pi5IX1cekyCz2o+phYt2r9aSRQUbOg==
   dependencies:
     "@babel/core" "^7.24.4"
     "@babel/preset-env" "^7.24.4"
     "@babel/types" "^7.24.0"
     "@storybook/csf" "^0.1.7"
-    "@storybook/csf-tools" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/csf-tools" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/cross-spawn" "^6.0.2"
     cross-spawn "^7.0.3"
     globby "^14.0.1"
@@ -2974,31 +2974,31 @@
     recast "^0.23.5"
     tiny-invariant "^1.3.1"
 
-"@storybook/components@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-8.1.2.tgz#e4bd892206f8fc22ac5321818afe5ac95ad954e5"
-  integrity sha512-jv/oSyD9usXeVa278NOD8sGe4J2HM1O7JBvCwQdjw/QPAe/TeDNei80qwiQDYuU6z3R5ELXbLt1MhxZxQXEVAQ==
+"@storybook/components@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-8.1.3.tgz#47e753795fd6203c7ecebde93681945779ed3c42"
+  integrity sha512-g9HB3CZvhDWoh1UJ4FiRRHDgZtKmh8H38zCK9xzyySxD9V7f9BobBChb3Xqlou3YCk5MqlGqudIg+xtHqNBPrg==
   dependencies:
     "@radix-ui/react-dialog" "^1.0.5"
     "@radix-ui/react-slot" "^1.0.2"
-    "@storybook/client-logger" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
     "@storybook/csf" "^0.1.7"
     "@storybook/global" "^5.0.0"
     "@storybook/icons" "^1.2.5"
-    "@storybook/theming" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/theming" "8.1.3"
+    "@storybook/types" "8.1.3"
     memoizerific "^1.11.3"
     util-deprecate "^1.0.2"
 
-"@storybook/core-common@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-8.1.2.tgz#5bc286fcf2bb06ebfa6b32cbc6263f9aa0604c49"
-  integrity sha512-Wt9xMXVSXDA7Kzk6II6SISvRVHeAtOVuJOu3VnpsFFd3tBFiXMA7jD25rHVMB3VlZDT8iaoAgdZDYnq4xYTRJg==
+"@storybook/core-common@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-8.1.3.tgz#7779a76095e8216af48169bb6b370f6b8e189361"
+  integrity sha512-VLG2Kg6oX0msq/Gjo+Pveqg7oLnJBClzms43/nwh6oxjJ/TFehRi3DyLjLqL+Nj726LI5lQetFZZyrsHudVskg==
   dependencies:
-    "@storybook/core-events" "8.1.2"
-    "@storybook/csf-tools" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/core-events" "8.1.3"
+    "@storybook/csf-tools" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@yarnpkg/fslib" "2.10.3"
     "@yarnpkg/libzip" "2.3.0"
     chalk "^4.1.0"
@@ -3025,37 +3025,37 @@
     ts-dedent "^2.0.0"
     util "^0.12.4"
 
-"@storybook/core-events@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-8.1.2.tgz#60830a530bc63fe40012a6934ea18658067f3f56"
-  integrity sha512-GKsvo/eeEQYDEhAw5YkUIZHYNurAJjzW3+uzThUuC1r0CGcfE+twJVfQXynAyOgL6hFdqy7879/3augf3v3cJQ==
+"@storybook/core-events@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-8.1.3.tgz#90e0292282cdb09acb15f1ee7054390bcc9209aa"
+  integrity sha512-eOs4HRrsEZz2FZFlMGwPuH9CGYBK8fkUS7mcHNPv8CqoHV8d3ErvDax8zA/KGRj3S6kWJ4PzI9IGuiDVvwuxhA==
   dependencies:
     "@storybook/csf" "^0.1.7"
     ts-dedent "^2.0.0"
 
-"@storybook/core-server@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-8.1.2.tgz#389718a501066b9b07b5bcc5dceafcf08c59700c"
-  integrity sha512-I2DR6rWv3BYCu1of2rAo8fcgqsW2NdKRm3omPqW7VRtICYiV9EnOUqV8wbEmvWtFJkuweH5o/P3rSKre2j2scw==
+"@storybook/core-server@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-8.1.3.tgz#5437219a2dd5c0479e30ea25153979f872732a1d"
+  integrity sha512-bOHbLI5atDFBOsFc5M0V0ikURVw+Kx/jRXGO5dnc6kr5SwW+ZfWooy1hiFKHRnI8hmVpGXcS6YqTHkUbcrAWgA==
   dependencies:
     "@aw-web-design/x-default-browser" "1.4.126"
     "@babel/core" "^7.24.4"
     "@babel/parser" "^7.24.4"
     "@discoveryjs/json-ext" "^0.5.3"
-    "@storybook/builder-manager" "8.1.2"
-    "@storybook/channels" "8.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/builder-manager" "8.1.3"
+    "@storybook/channels" "8.1.3"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/csf" "^0.1.7"
-    "@storybook/csf-tools" "8.1.2"
+    "@storybook/csf-tools" "8.1.3"
     "@storybook/docs-mdx" "3.1.0-next.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager" "8.1.2"
-    "@storybook/manager-api" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
-    "@storybook/telemetry" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/manager" "8.1.3"
+    "@storybook/manager-api" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
+    "@storybook/telemetry" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/detect-port" "^1.3.0"
     "@types/diff" "^5.0.9"
     "@types/node" "^18.0.0"
@@ -3085,36 +3085,36 @@
     watchpack "^2.2.0"
     ws "^8.2.3"
 
-"@storybook/core-webpack@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-8.1.2.tgz#c9891598885eddd5c9b0945bdf2be0f857aea7be"
-  integrity sha512-VZBqqTbz9XpCvmYjfRWfCQfa+QDWPV7rjs0dEFiKklB0HkUgAsmqnRBlWHsWUXIJWhdL9IvxIU0NgA+v161zIQ==
+"@storybook/core-webpack@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-8.1.3.tgz#a2443019582410d7f17d6e844a42d3a69341aa69"
+  integrity sha512-LLcEkEBgKcwsn3nC03eTji0ePmcfbRi9S82uc44/0dvnJT7Eshk0pFNuLl+flW6JtzcYtKZ7PeCn/Gp9ekhqEg==
   dependencies:
-    "@storybook/core-common" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/node" "^18.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/csf-plugin@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-8.1.2.tgz#b702dd831080086acafe8e1bb5635ce80d01bb7e"
-  integrity sha512-MSWt4/bypBjfbPqna7FvIMLuvghmCfLkHMRFzZC5stUcEqPQavpTyxw8Kw0xFMTLaiBlDgi58EzDlGAXYKVZVw==
+"@storybook/csf-plugin@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-8.1.3.tgz#8820364f1cd6bd1a73caec7e41681ac51ff2563e"
+  integrity sha512-ONKhnz2j3zSa2RseBWypabTniRcs77ZWBdTrxnBqQap55tRMOAS/uCG+bgGgWlzwDskX35Kmd7XGkVOEngWSDQ==
   dependencies:
-    "@storybook/csf-tools" "8.1.2"
+    "@storybook/csf-tools" "8.1.3"
     unplugin "^1.3.1"
 
-"@storybook/csf-tools@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-8.1.2.tgz#dd15fd544251c73c6879eb7da41de3ea3f49254c"
-  integrity sha512-IGK6wx8qBuAmnPii2iSJ+ry3mGwd4iksHYypeKfrrkbmzKFG2Qh8QbytPrJz0FkTHI22kXPoQW2Ar9b0PyeqIA==
+"@storybook/csf-tools@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-8.1.3.tgz#bf7b706f3da21c42e4ccfbadb7ad548d62ee07d2"
+  integrity sha512-22h6Uv7w29v8HjoFsJvAkBci9POVH0aQhlfZ4NNYkiMbgD4X4HWeD2wqob6fTKpVWP3tDaNS9FfCWHxQXFE+ag==
   dependencies:
     "@babel/generator" "^7.24.4"
     "@babel/parser" "^7.24.4"
     "@babel/traverse" "^7.24.1"
     "@babel/types" "^7.24.0"
     "@storybook/csf" "^0.1.7"
-    "@storybook/types" "8.1.2"
+    "@storybook/types" "8.1.3"
     fs-extra "^11.1.0"
     recast "^0.23.5"
     ts-dedent "^2.0.0"
@@ -3131,15 +3131,15 @@
   resolved "https://registry.yarnpkg.com/@storybook/docs-mdx/-/docs-mdx-3.1.0-next.0.tgz#9567c6eb621110dcf6554923a975238953d06305"
   integrity sha512-t4syFIeSyufieNovZbLruPt2DmRKpbwL4fERCZ1MifWDRIORCKLc4NCEHy+IqvIqd71/SJV2k4B51nF7vlJfmQ==
 
-"@storybook/docs-tools@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-8.1.2.tgz#1b25eba9cbadd0ef0a1409c87e12e2458ecf4b61"
-  integrity sha512-FWhs/ZN0Fc4Qke5zdA6l0UJhIP5kdrrRjEXe0IppP7UIvtRUgrIhiS4Kz/Re110cOkjO5/K0Hr6yQPLSCPnPKA==
+"@storybook/docs-tools@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-8.1.3.tgz#a93045b1547d86575f52a81da7f391e1fa653ee4"
+  integrity sha512-EQIgzO5KdvEck0/20lR/znq1xCC7O1HvKd+yIkZ4bEGn2XnqWk8rmReKSOMI476rb3sn1CMIntT2BRsBUOfTOw==
   dependencies:
-    "@storybook/core-common" "8.1.2"
-    "@storybook/core-events" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/core-events" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/doctrine" "^0.0.3"
     assert "^2.1.0"
     doctrine "^3.0.0"
@@ -3155,33 +3155,33 @@
   resolved "https://registry.yarnpkg.com/@storybook/icons/-/icons-1.2.9.tgz#bb4a51a79e186b62e2dd0e04928b8617ac573838"
   integrity sha512-cOmylsz25SYXaJL/gvTk/dl3pyk7yBFRfeXTsHvTA3dfhoU/LWSq0NKL9nM7WBasJyn6XPSGnLS4RtKXLw5EUg==
 
-"@storybook/instrumenter@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-8.1.2.tgz#ae7d01ba2c09fa21e6a7a225734b5d19c8dac639"
-  integrity sha512-TWldk4QTtraVaCizQrsnf4y23IPz1OqUOvzY5bA8Aje9FzzX7YHo9yEGEvd4Nx6c2GaBnInn/gWmqucmWngJDg==
+"@storybook/instrumenter@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-8.1.3.tgz#f0d66507e1dc5170713f729f59e69cfac2fa25e2"
+  integrity sha512-FYWXt6Pb7N64I934XxciRHUhy37l//uvXyQOwxIyI9syf2ESixpWHgPKd7XjyjULa3JOA2IAEJ3BEZVpqFirog==
   dependencies:
-    "@storybook/channels" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/channels" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "8.1.2"
+    "@storybook/preview-api" "8.1.3"
     "@vitest/utils" "^1.3.1"
     util "^0.12.4"
 
-"@storybook/manager-api@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-8.1.2.tgz#f090cf9d371ee2b3592fc7090d5ccf998e973e1f"
-  integrity sha512-6Ge7EEx94YJm3HcfjkDfRPMnr5qVdF2RzhvyflJapBxMV0X44mkGPUWyzft3cf+vUCQlXXrmtBeZauB6JTJuiA==
+"@storybook/manager-api@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-8.1.3.tgz#19d8ceb42bcb0b85848900e01d12d198256c1bcd"
+  integrity sha512-2OpbHK0a3Tak+Wba0ZW/b17C62hdXMFa++rzGT7KzFcVmzg8Nx464wVx2hlrNxjlfBJkHoT723irAiAwmIl2Pg==
   dependencies:
-    "@storybook/channels" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/channels" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/csf" "^0.1.7"
     "@storybook/global" "^5.0.0"
     "@storybook/icons" "^1.2.5"
-    "@storybook/router" "8.1.2"
-    "@storybook/theming" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/router" "8.1.3"
+    "@storybook/theming" "8.1.3"
+    "@storybook/types" "8.1.3"
     dequal "^2.0.2"
     lodash "^4.17.21"
     memoizerific "^1.11.3"
@@ -3189,25 +3189,25 @@
     telejson "^7.2.0"
     ts-dedent "^2.0.0"
 
-"@storybook/manager@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-8.1.2.tgz#8dd31513f1e42ded4ef82aa404f097f2249f0a02"
-  integrity sha512-RMAyvXkKId3C1ryYjcp8aSajTdtFc1+B+HvrehszrCWklj7H7sBJ5ZQFhw0WASDwyF/fzEnR7epb2kDjIKeCHA==
+"@storybook/manager@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-8.1.3.tgz#4ee8ce6ba9dd8175d7a0f116f8b45da0015b4dff"
+  integrity sha512-hmfQJJNLSqlM+jfcCXo5wnhUIugTsCxv6a+2UnRAt2AnF6J746QaV0npMThw1QG/7fi/ofaRY8hPGxgCN9uHRA==
 
-"@storybook/node-logger@8.1.2", "@storybook/node-logger@^8.0.0-alpha.10":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-8.1.2.tgz#47309d08022554a6c987f7c8dae77a804a3d6f49"
-  integrity sha512-qdCzcDKsRiEqy7FeD0p0ZvIMqaXWn+GY0q0VkrGGhSwPJ3cxyIuyA+GA9FkXUMzxVJKgR7Gh9dOlTEaCe5ZjfA==
+"@storybook/node-logger@8.1.3", "@storybook/node-logger@^8.0.0-alpha.10":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-8.1.3.tgz#a9eed04dc91b9f4a22d8f05d7cf95341d094b01f"
+  integrity sha512-MpQ7Zl5n58zbFr1Yu3qgInGENoScEnfqsCxipMhj57b5SWJJ7NoOdSAWznjFFffo8NoaqxldHscuaQfzPBN9hA==
 
-"@storybook/preset-react-webpack@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-8.1.2.tgz#3d325e4ba264dc520726508ca6708af8d240e6b0"
-  integrity sha512-6khGxusOxGdfwTxIfIOPmFcYam27K1rFBB1ux4mfRWlc2pGs1AJVFBZkXTYumWBCpT74qd7EV0o9PoWX7eNlIw==
+"@storybook/preset-react-webpack@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-8.1.3.tgz#613db21d6baccd979f6515a93c6be5493bbce276"
+  integrity sha512-YfoPHHKHtSIT52IEaseRAYoTR4ie0NgfZqzI3JBiACriC7nAp9qToKs3rssB8+r/5220HqbSNJT6cwSoSHuL8w==
   dependencies:
-    "@storybook/core-webpack" "8.1.2"
-    "@storybook/docs-tools" "8.1.2"
-    "@storybook/node-logger" "8.1.2"
-    "@storybook/react" "8.1.2"
+    "@storybook/core-webpack" "8.1.3"
+    "@storybook/docs-tools" "8.1.3"
+    "@storybook/node-logger" "8.1.3"
+    "@storybook/react" "8.1.3"
     "@storybook/react-docgen-typescript-plugin" "1.0.6--canary.9.0c3f3b7.0"
     "@types/node" "^18.0.0"
     "@types/semver" "^7.3.4"
@@ -3220,17 +3220,17 @@
     tsconfig-paths "^4.2.0"
     webpack "5"
 
-"@storybook/preview-api@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-8.1.2.tgz#614de0a39a775c32894500bda7a5027d6a44441f"
-  integrity sha512-94xFDtyz8l2TdyHQiew2RZ8YLkHAgD/qGgosrLUTX9w+Pe0stU+SyiyinMVof/cac8lPzQoK60fwTABHkv8Gpg==
+"@storybook/preview-api@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-8.1.3.tgz#f641d223558d2ea6ebd926eb56f2c29d4ebe3b0d"
+  integrity sha512-2eyNVr5wLzglE7KABdXu4nu+rPjJ8gVDP9TiovgU1MHhE5rX8qbKmJ47ymWSfJT1DMvH2dPISh4/wRK3WVNjmw==
   dependencies:
-    "@storybook/channels" "8.1.2"
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-events" "8.1.2"
+    "@storybook/channels" "8.1.3"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-events" "8.1.3"
     "@storybook/csf" "^0.1.7"
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "8.1.2"
+    "@storybook/types" "8.1.3"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -3240,10 +3240,10 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/preview@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-8.1.2.tgz#c370adaa4589b3057dfa2ba3dd278c1bab32b47c"
-  integrity sha512-8VjDPF2sTU7iYigISV47ug90LI1u9PLCMY71hWqHAyrAMfPd6GIz0bO5scfZ1eOwN7jIgFZVFoSBYq8kmA4iiQ==
+"@storybook/preview@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-8.1.3.tgz#6b91bd1df0ec26db4b0e01e7e7306f63cf7abc2e"
+  integrity sha512-04Aet1jrsSMuJ/pm21GJBmSAaJdPhy/fhir50jKiQTwBMgM19G0HQ1IUMHgcy85fh/DWg1/h4pxVodvWvdIZfQ==
 
 "@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0":
   version "1.0.6--canary.9.0c3f3b7.0"
@@ -3258,33 +3258,33 @@
     react-docgen-typescript "^2.2.2"
     tslib "^2.0.0"
 
-"@storybook/react-dom-shim@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-8.1.2.tgz#654c0cab71940ba6613e3b96ca4980e24b956ce1"
-  integrity sha512-Djcq9MBYfefwGdk3k3jmZrLxSRM0y0RQQ0M5c8zMkM6Hbqo0MKd/UXnAKoQ8TadNnNUNaVpkanRv7KWlF0FFUQ==
+"@storybook/react-dom-shim@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-8.1.3.tgz#bd991e15d574a0e85666d3f1af10913eadc8d0c5"
+  integrity sha512-CTyxH/ssU5KRbUwi3ws2NWEnMS6rjat0AYyhcskdPiPU59Qm24TrSpLqO+Rgzln8w7EDFsty3lLpcPNYs+BKlQ==
 
 "@storybook/react-webpack5@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-8.1.2.tgz#fcebd1e7fb2766e1760c67716f0347358e35710e"
-  integrity sha512-VCvLFjnfZpIFRg5NoOyyR+fGmBc7tJrJ2pag3x4TbzzOGG6plx6dZ6YaB4EgLz5/kMs2dUOnONlcFwLrAS7EoQ==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-8.1.3.tgz#8b33328c4d7497abc3a85bb6d32902cd2a6d9d7c"
+  integrity sha512-tRerBsqR6Q5hPNQQ76FMws9jpXGybB6ZiRVucPWi7UrdQTbCIrmL92r+WreKOWm5TamVxo9j5oCeoj4/I7ED+Q==
   dependencies:
-    "@storybook/builder-webpack5" "8.1.2"
-    "@storybook/preset-react-webpack" "8.1.2"
-    "@storybook/react" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/builder-webpack5" "8.1.3"
+    "@storybook/preset-react-webpack" "8.1.3"
+    "@storybook/react" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/node" "^18.0.0"
 
-"@storybook/react@8.1.2", "@storybook/react@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-8.1.2.tgz#082255f0071f7ac803f0115ef4437bda73dd6cae"
-  integrity sha512-Gg/dm3GT0wsK+4TdNsbu6CLsPShfkTujlDEKRBxeGMsLsQOwIayZp67fYjSj3OE6EachMAQToNgtDweIMMXhEg==
+"@storybook/react@8.1.3", "@storybook/react@^8.1.1":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-8.1.3.tgz#27d88768bf79ec0722ed23c6daf0f9dfdc6c24ef"
+  integrity sha512-95BytmZIpSg+QYO6glC6Oq+J0LlTTz9euL7trlYdzCpnuo6gBTaxtttSCQij4pRzRC/06tcDAK65l2JyYpiTXg==
   dependencies:
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/docs-tools" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/docs-tools" "8.1.3"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "8.1.2"
-    "@storybook/react-dom-shim" "8.1.2"
-    "@storybook/types" "8.1.2"
+    "@storybook/preview-api" "8.1.3"
+    "@storybook/react-dom-shim" "8.1.3"
+    "@storybook/types" "8.1.3"
     "@types/escodegen" "^0.0.6"
     "@types/estree" "^0.0.51"
     "@types/node" "^18.0.0"
@@ -3301,38 +3301,38 @@
     type-fest "~2.19"
     util-deprecate "^1.0.2"
 
-"@storybook/router@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-8.1.2.tgz#875ec8d61c2cd427844578d256bc3d2141230818"
-  integrity sha512-Lu05lDqoIinda1z43Danxhaq9t8k5jSKHJZXEIDsiLPUkGQCW3syzSE03c7qzOAbN/gmd/cu9MkmvGW+HBnWSA==
+"@storybook/router@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-8.1.3.tgz#35992e2430e2716fb304592685430cb8da323ec5"
+  integrity sha512-CVEMpRD+PDVb+oZ3Sd0SV4P9vBJhYDgYiO9Km9X1jV6iyg/CXIALlo5Rd9pT+/U8IdqI2QX3bkZBUgCFDff67w==
   dependencies:
-    "@storybook/client-logger" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/telemetry@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-8.1.2.tgz#549a7d813c0c501f5b882b7d040a5b183cee54f7"
-  integrity sha512-FoJUDtRPNM5pTvnbQOPTGBIsmW2r/XC//DtHj84B8g7V+Ww+TToMrQWWgPTQwD1epL+ihtxbAV47EUlSB9mMDw==
+"@storybook/telemetry@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-8.1.3.tgz#c0dac80ba496f7356e77b57beb0698d2fbc34960"
+  integrity sha512-edFj0AJ3DEF8Z6Ym6ue7N8U9HZ2khAfXIcpk6RDgL/8FrpAZKC96XSEBMSnem3BLHxMi2bddQH1UTU6rKXrfBA==
   dependencies:
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-common" "8.1.2"
-    "@storybook/csf-tools" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-common" "8.1.3"
+    "@storybook/csf-tools" "8.1.3"
     chalk "^4.1.0"
     detect-package-manager "^2.0.1"
     fetch-retry "^5.0.2"
     fs-extra "^11.1.0"
     read-pkg-up "^7.0.1"
 
-"@storybook/test@8.1.2", "@storybook/test@^8.1.1":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/test/-/test-8.1.2.tgz#ead03dad1c76b2c905e223c0e864f2047e6fb5d8"
-  integrity sha512-wSsO7VSF9dM4NdiOu7EMQd326HpmkKzCarpIHm+FsxRemYfB6wCjbNRIrXe81PLSfyzFte8/ZvMPo0LeMefwHA==
+"@storybook/test@8.1.3", "@storybook/test@^8.1.1":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/test/-/test-8.1.3.tgz#17cbe89c6d8fc787121b9068444c213ebcb27d4e"
+  integrity sha512-9fjigeDBUk1X7el6haYk1Lniak0Se7Ol5f7QSw/64tIbXHp6ucj06FWEK+SfWx1J9GgCdDiFGW5UMmEZOiRCXw==
   dependencies:
-    "@storybook/client-logger" "8.1.2"
-    "@storybook/core-events" "8.1.2"
-    "@storybook/instrumenter" "8.1.2"
-    "@storybook/preview-api" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
+    "@storybook/core-events" "8.1.3"
+    "@storybook/instrumenter" "8.1.3"
+    "@storybook/preview-api" "8.1.3"
     "@testing-library/dom" "^9.3.4"
     "@testing-library/jest-dom" "^6.4.2"
     "@testing-library/user-event" "^14.5.2"
@@ -3340,22 +3340,22 @@
     "@vitest/spy" "^1.3.1"
     util "^0.12.4"
 
-"@storybook/theming@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-8.1.2.tgz#fa7ddc2eee788d8916f982ce46af2d42b47b1042"
-  integrity sha512-4ayCoSluaReGfj+wDa/KKwX5mEReVsjDhQ3nCusKsPQJK5zgT4Vt4CZekU7IK0cYmRPF4nMgVH3m3jmMD4x4ng==
+"@storybook/theming@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-8.1.3.tgz#b64167d75f62e14b45cd9a5abb284cfa7f6214a1"
+  integrity sha512-BXtD5pna4eAAxNbzZUijP6W25IFVhvANG5P96xYM+OH+5OMSdLpDANnG2qWcZumwX5JFd74KqOIuV8yIO0AYXQ==
   dependencies:
     "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1"
-    "@storybook/client-logger" "8.1.2"
+    "@storybook/client-logger" "8.1.3"
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
-"@storybook/types@8.1.2":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-8.1.2.tgz#7924596d4dfc6c2c156c52af0906856da0a278fd"
-  integrity sha512-8P3rB/6UxHlui0/Gdh2/qQvyLy6efJxVUt0g7iANQorqdYMxRNS/OtxNjI8rxFB3sIvl4owG7iYh3j2RCCEqaQ==
+"@storybook/types@8.1.3":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-8.1.3.tgz#25c4e90dc342b76652fc96dd1aba7b44ea6dd2ab"
+  integrity sha512-2uUC1z7heMceRPHQ4KCcZwwKjtW2YiToUODsEw0YOq6NC/Q9elZta1FABSG0Bq7XM08EiAgjyc7P9CZPJ2QxUQ==
   dependencies:
-    "@storybook/channels" "8.1.2"
+    "@storybook/channels" "8.1.3"
     "@types/express" "^4.7.0"
     file-system-cache "2.3.0"
 
@@ -4010,11 +4010,6 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@18.0.6":
-  version "18.0.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7"
-  integrity sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==
-
 "@types/node@18.14.1":
   version "18.14.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f"
@@ -4094,7 +4089,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18.2.42", "@types/react@^18.2.48":
+"@types/react@*", "@types/react@18.2.48", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18.2.42", "@types/react@^18.2.48":
   version "18.2.48"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.48.tgz#11df5664642d0bd879c1f58bc1d37205b064e8f1"
   integrity sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==
@@ -5076,9 +5071,9 @@ bare-os@^2.1.0:
   integrity sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==
 
 bare-path@^2.0.0, bare-path@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.2.tgz#7a0940d34ebe65f7e179fa61ed8d49d9dc151d67"
-  integrity sha512-o7KSt4prEphWUHa3QUwCxUI00R86VdjiuxmJK0iNVDHYPGo+HsDaVCnqCmPbf/MiW1ok8F4p3m8RTHlWk8K2ig==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.3.tgz#594104c829ef660e43b5589ec8daef7df6cedb3e"
+  integrity sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==
   dependencies:
     bare-os "^2.1.0"
 
@@ -6343,9 +6338,9 @@ ejs@^3.1.10, ejs@^3.1.6:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.668:
-  version "1.4.777"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.777.tgz#f846fbba23fd11b3c6f97848cdda94896fdb8baf"
-  integrity sha512-n02NCwLJ3wexLfK/yQeqfywCblZqLcXphzmid5e8yVPdtEcida7li0A5WQKghHNG0FeOMCzeFOzEbtAh5riXFw==
+  version "1.4.782"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz#726d7916f0f0a80524c2a2a19e5dceb60d35ce0e"
+  integrity sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==
 
 emoji-picker-react@^4.5.16:
   version "4.9.3"
@@ -7636,15 +7631,15 @@ glob@10.3.10:
     path-scurry "^1.10.1"
 
 glob@^10.0.0, glob@^10.3.10:
-  version "10.3.16"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.16.tgz#bf6679d5d51279c8cfae4febe0d051d2a4bf4c6f"
-  integrity sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^3.1.2"
-    minimatch "^9.0.1"
-    minipass "^7.0.4"
-    path-scurry "^1.11.0"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
 
 glob@^7.0.3, glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
@@ -9360,10 +9355,10 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.1.tgz#f7f85aff59aa22f110b20e27692465cf3bf89481"
-  integrity sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 minizlib@^2.1.1:
   version "2.1.2"
@@ -9942,7 +9937,7 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.1, path-scurry@^1.11.0:
+path-scurry@^1.10.1, path-scurry@^1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
   integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
@@ -10179,9 +10174,9 @@ postcss-selector-parser@6.0.10:
     util-deprecate "^1.0.2"
 
 postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
-  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53"
+  integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -10210,9 +10205,9 @@ postcss@^8.4.23, postcss@^8.4.29, postcss@^8.4.33, postcss@^8.4.38:
     source-map-js "^1.2.0"
 
 posthog-js@^1.131.3:
-  version "1.132.2"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.132.2.tgz#6d776fbba0db699517a04eaaf5278da4914a4efd"
-  integrity sha512-GkiulyjQU7Ez48jcAeEXgj5zUFE2/D1nKIB83sJk/fD+8sLIYrK6ksR34ZkolEq6lRkFfuSoai/+Zgj79QbyXA==
+  version "1.135.0"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.135.0.tgz#92042bad1ac2afb820d729d1c51b92645e8242fe"
+  integrity sha512-UfFHrF7FTMnZOC00/gBRdDM0liNHJk0uG/oMwLkiG/0nx/fRzuWPstlA2CIE/MWAXdBuRrI0dmxUZlowNECHig==
   dependencies:
     fflate "^0.4.8"
     preact "^10.19.3"
@@ -11548,7 +11543,7 @@ snake-case@^3.0.4:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
-sonner@^1.4.2:
+sonner@^1.4.41:
   version "1.4.41"
   resolved "https://registry.yarnpkg.com/sonner/-/sonner-1.4.41.tgz#ff085ae4f4244713daf294959beaa3e90f842d2c"
   integrity sha512-uG511ggnnsw6gcn/X+YKkWPo5ep9il9wYi3QJxHsYe7yTZ4+cOd1wuodOUmOpFuXL+/RE3R04LczdNCDygTDgQ==
@@ -11620,9 +11615,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
-  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
+  version "3.0.18"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326"
+  integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==
 
 stacktrace-parser@^0.1.10:
   version "0.1.10"
@@ -11649,11 +11644,11 @@ store2@^2.14.2:
   integrity sha512-4QcZ+yx7nzEFiV4BMLnr/pRa5HYzNITX2ri0Zh6sT9EyQHbBHacC6YigllUPU9X3D0f/22QCgfokpKs52YRrUg==
 
 storybook@^8.1.1:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-8.1.2.tgz#cb24e549d56050543d290188cad014712fa59d1e"
-  integrity sha512-6yJ7e320AmT6x8IGeNd3P79RDZI+8v9Pp3AZaHLgBnxdp4qehSfBZxW9MtZunVnXlgpI+HXOogwMJMWayg428A==
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-8.1.3.tgz#f047b2c945df1c98452bc5756203897e57baca78"
+  integrity sha512-djsH1nPnX3G84hWR/HmofrfiZ8mN7dyP7uDYkR8O2rd/pfZ3fMI6iaKKWL73Z+WGAiK2Ax9oSmaZSGwgS6k3Rg==
   dependencies:
-    "@storybook/cli" "8.1.2"
+    "@storybook/cli" "8.1.3"
 
 stream-shift@^1.0.0:
   version "1.0.3"
@@ -12211,9 +12206,9 @@ to-regex-range@^5.0.1:
     is-number "^7.0.0"
 
 tocbot@^4.20.1:
-  version "4.28.0"
-  resolved "https://registry.yarnpkg.com/tocbot/-/tocbot-4.28.0.tgz#fb5ffb1e342d21d244404885d2f8ac33d37161c4"
-  integrity sha512-E1RJiEOBKxFvSezbPsFW3z+K7faYgcTp+LwBRpJj1bZ8XTAobh5Y9TaVjW6ND3mAc9BDOmqwhH7xpF4on6R++w==
+  version "4.28.2"
+  resolved "https://registry.yarnpkg.com/tocbot/-/tocbot-4.28.2.tgz#5a51b34cefd39f6b556b936b380a838a0a8c49ea"
+  integrity sha512-/MaSa9xI6mIo84IxqqliSCtPlH0oy7sLcY9s26qPMyH/2CxtZ2vNAXYlIdEQ7kjAkCQnc0rbLygf//F5c663oQ==
 
 toidentifier@1.0.1:
   version "1.0.1"