diff --git a/src/app/deals/components/desktop/DealsTable/DealsTable.tsx b/src/app/deals/components/desktop/DealsTable/DealsTable.tsx
index 4810fe0..49c1318 100644
--- a/src/app/deals/components/desktop/DealsTable/DealsTable.tsx
+++ b/src/app/deals/components/desktop/DealsTable/DealsTable.tsx
@@ -3,7 +3,6 @@ import { IconMoodSad } from "@tabler/icons-react";
 import { Group, Pagination, Stack, Text } from "@mantine/core";
 import useDealsTableColumns from "@/app/deals/components/desktop/DealsTable/useDealsTableColumns";
 import { useDealsContext } from "@/app/deals/contexts/DealsContext";
-import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
 import BaseTable from "@/components/ui/BaseTable/BaseTable";
 import { useDrawersContext } from "@/drawers/DrawersContext";
 import { DealSchema } from "@/lib/client";
@@ -11,18 +10,16 @@ import { DealSchema } from "@/lib/client";
 const DealsTable: FC = () => {
     const { deals, paginationInfo, page, setPage, sortingForm, dealsCrud } =
         useDealsContext();
-    const { selectedProject } = useProjectsContext();
     const { openDrawer } = useDrawersContext();
 
     const onEditClick = useCallback(
         (deal: DealSchema) => {
-            if (!selectedProject) return;
             openDrawer({
                 key: "dealEditorDrawer",
                 props: {
-                    deal,
-                    dealsCrud,
-                    project: selectedProject,
+                    value: deal,
+                    onChange: deal => dealsCrud.onUpdate(deal.id, deal),
+                    onDelete: dealsCrud.onDelete,
                 },
             });
         },
diff --git a/src/app/deals/components/desktop/TopToolPanel/TopToolPanel.tsx b/src/app/deals/components/desktop/TopToolPanel/TopToolPanel.tsx
index 1062e58..de496a0 100644
--- a/src/app/deals/components/desktop/TopToolPanel/TopToolPanel.tsx
+++ b/src/app/deals/components/desktop/TopToolPanel/TopToolPanel.tsx
@@ -44,8 +44,12 @@ const TopToolPanel: FC<Props> = ({ view, setView }) => {
         if (!selectedProject) return;
 
         openDrawer({
-            key: "selectedProjectEditorDrawer",
-            props: { project: selectedProject, projectsCrud },
+            key: "projectEditorDrawer",
+            props: {
+                value: selectedProject,
+                onChange: value => projectsCrud.onUpdate(value.id, value),
+                onDelete: projectsCrud.onDelete,
+            },
         });
     };
 
diff --git a/src/app/deals/components/mobile/MainBlockHeader/MainBlockHeader.tsx b/src/app/deals/components/mobile/MainBlockHeader/MainBlockHeader.tsx
index 5fee885..b2ef8bb 100644
--- a/src/app/deals/components/mobile/MainBlockHeader/MainBlockHeader.tsx
+++ b/src/app/deals/components/mobile/MainBlockHeader/MainBlockHeader.tsx
@@ -22,9 +22,9 @@ const MainBlockHeader = () => {
 
     const openProjectsEditorDrawer = () => {
         openDrawer({
-            key: "projectsEditorDrawer",
+            key: "projectsMobileEditorDrawer",
             props: {
-                setSelectedProjectId: selectProjectId,
+                onSelect: project => selectProjectId(project?.id ?? null),
             },
         });
     };
@@ -32,7 +32,7 @@ const MainBlockHeader = () => {
     const openBoardsEditorDrawer = () => {
         if (!selectedProject) return;
         openDrawer({
-            key: "projectBoardsEditorDrawer",
+            key: "boardsMobileEditorDrawer",
             props: {
                 project: selectedProject,
             },
diff --git a/src/app/deals/components/shared/DealCard/DealCard.tsx b/src/app/deals/components/shared/DealCard/DealCard.tsx
index 28cad7c..9b66ab0 100644
--- a/src/app/deals/components/shared/DealCard/DealCard.tsx
+++ b/src/app/deals/components/shared/DealCard/DealCard.tsx
@@ -1,6 +1,5 @@
 import { Box, Card, Group, Pill, Stack, Text } from "@mantine/core";
 import { useDealsContext } from "@/app/deals/contexts/DealsContext";
-import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
 import { useDrawersContext } from "@/drawers/DrawersContext";
 import { DealSchema } from "@/lib/client";
 import styles from "./DealCard.module.css";
@@ -10,15 +9,17 @@ type Props = {
 };
 
 const DealCard = ({ deal }: Props) => {
-    const { selectedProject } = useProjectsContext();
     const { dealsCrud } = useDealsContext();
     const { openDrawer } = useDrawersContext();
 
     const onClick = () => {
-        if (!selectedProject) return;
         openDrawer({
             key: "dealEditorDrawer",
-            props: { project: selectedProject, deal, dealsCrud },
+            props: {
+                value: deal,
+                onChange: deal => dealsCrud.onUpdate(deal.id, deal),
+                onDelete: dealsCrud.onDelete,
+            },
         });
     };
 
diff --git a/src/app/deals/components/shared/StatusMenu/StatusMenu.tsx b/src/app/deals/components/shared/StatusMenu/StatusMenu.tsx
index dbc0adb..8e5ae6a 100644
--- a/src/app/deals/components/shared/StatusMenu/StatusMenu.tsx
+++ b/src/app/deals/components/shared/StatusMenu/StatusMenu.tsx
@@ -69,7 +69,7 @@ const StatusMenu: FC<Props> = ({
                             e.stopPropagation();
                             if (!board) return;
                             openDrawer({
-                                key: "boardStatusesEditorDrawer",
+                                key: "statusesMobileEditorDrawer",
                                 props: {
                                     board,
                                 },
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/index.ts b/src/app/deals/drawers/BoardStatusesEditorDrawer/index.ts
deleted file mode 100644
index 2ccd309..0000000
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import BoardStatusesEditorDrawer from "@/app/deals/drawers/BoardStatusesEditorDrawer/BoardStatusesEditorDrawer";
-
-export default BoardStatusesEditorDrawer;
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/ProjectBoardsEditorDrawer.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
similarity index 66%
rename from src/app/deals/drawers/ProjectBoardsEditorDrawer/ProjectBoardsEditorDrawer.tsx
rename to src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
index a72a967..13aa1ff 100644
--- a/src/app/deals/drawers/ProjectBoardsEditorDrawer/ProjectBoardsEditorDrawer.tsx
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
@@ -2,8 +2,8 @@
 
 import React, { FC } from "react";
 import { Drawer, rem } from "@mantine/core";
-import BoardsDrawerBody from "@/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardsDrawerBody";
-import { ProjectBoardsContextProvider } from "@/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext";
+import BoardsDrawerBody from "@/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardsDrawerBody";
+import { BoardsMobileContextProvider } from "@/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext";
 import { DrawerProps } from "@/drawers/types";
 import { ProjectSchema } from "@/lib/client";
 
@@ -11,7 +11,7 @@ type Props = {
     project: ProjectSchema;
 };
 
-const ProjectBoardsEditorDrawer: FC<DrawerProps<Props>> = ({
+const BoardsMobileEditorDrawer: FC<DrawerProps<Props>> = ({
     onClose,
     opened,
     props: { project },
@@ -33,11 +33,11 @@ const ProjectBoardsEditorDrawer: FC<DrawerProps<Props>> = ({
                     gap: rem(10),
                 },
             }}>
-            <ProjectBoardsContextProvider project={project}>
+            <BoardsMobileContextProvider project={project}>
                 <BoardsDrawerBody onClose={onClose} />
-            </ProjectBoardsContextProvider>
+            </BoardsMobileContextProvider>
         </Drawer>
     );
 };
 
-export default ProjectBoardsEditorDrawer;
+export default BoardsMobileEditorDrawer;
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardMobile.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardMobile.tsx
similarity index 87%
rename from src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardMobile.tsx
rename to src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardMobile.tsx
index 584d9a0..a2cc11b 100644
--- a/src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardMobile.tsx
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardMobile.tsx
@@ -2,7 +2,7 @@ import React, { FC } from "react";
 import { Box, Group, Text } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import BoardMenu from "@/app/deals/components/shared/BoardMenu/BoardMenu";
-import { useProjectBoardsContext } from "@/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext";
+import { useBoardsMobileContext } from "@/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext";
 import { BoardSchema } from "@/lib/client";
 
 type Props = {
@@ -10,7 +10,7 @@ type Props = {
 };
 
 const BoardMobile: FC<Props> = ({ board }) => {
-    const { boardsCrud } = useProjectBoardsContext();
+    const { boardsCrud } = useBoardsMobileContext();
 
     const startEditing = () => {
         modals.openContextModal({
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardsDrawerBody.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardsDrawerBody.tsx
similarity index 81%
rename from src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardsDrawerBody.tsx
rename to src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardsDrawerBody.tsx
index 2bc701e..3a0c94a 100644
--- a/src/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardsDrawerBody.tsx
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardsDrawerBody.tsx
@@ -1,9 +1,9 @@
 import React, { FC, ReactNode } from "react";
 import { IconChevronLeft, IconGripVertical } from "@tabler/icons-react";
 import { Box, Center, Divider, Group, Text } from "@mantine/core";
-import BoardMobile from "@/app/deals/drawers/ProjectBoardsEditorDrawer/components/BoardMobile";
-import CreateBoardButton from "@/app/deals/drawers/ProjectBoardsEditorDrawer/components/CreateBoardButton";
-import { useProjectBoardsContext } from "@/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext";
+import BoardMobile from "@/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardMobile";
+import CreateBoardButton from "@/app/deals/drawers/BoardsMobileEditorDrawer/components/CreateBoardButton";
+import { useBoardsMobileContext } from "@/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext";
 import SortableDnd from "@/components/dnd/SortableDnd";
 import { BoardSchema } from "@/lib/client";
 
@@ -12,7 +12,7 @@ type Props = {
 };
 
 const BoardsDrawerBody: FC<Props> = ({ onClose }) => {
-    const { boards, boardsCrud, project } = useProjectBoardsContext();
+    const { boards, boardsCrud, project } = useBoardsMobileContext();
 
     const renderDraggable = () => (
         <Box p={"xs"}>
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/components/CreateBoardButton.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/components/CreateBoardButton.tsx
similarity index 100%
rename from src/app/deals/drawers/ProjectBoardsEditorDrawer/components/CreateBoardButton.tsx
rename to src/app/deals/drawers/BoardsMobileEditorDrawer/components/CreateBoardButton.tsx
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext.tsx
similarity index 93%
rename from src/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext.tsx
rename to src/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext.tsx
index 797ae6e..5e0b663 100644
--- a/src/app/deals/drawers/ProjectBoardsEditorDrawer/contexts/ProjectBoardsContext.tsx
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext.tsx
@@ -40,7 +40,7 @@ const useProjectBoardsContextState = ({ project }: Props) => {
     };
 };
 
-export const [ProjectBoardsContextProvider, useProjectBoardsContext] =
+export const [BoardsMobileContextProvider, useBoardsMobileContext] =
     makeContext<ProjectBoardsContextState, Props>(
         useProjectBoardsContextState,
         "ProjectBoards"
diff --git a/src/app/deals/drawers/BoardsMobileEditorDrawer/index.ts b/src/app/deals/drawers/BoardsMobileEditorDrawer/index.ts
new file mode 100644
index 0000000..a8ffadb
--- /dev/null
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/index.ts
@@ -0,0 +1,3 @@
+import BoardsMobileEditorDrawer from "@/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer";
+
+export default BoardsMobileEditorDrawer;
diff --git a/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx b/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx
index 62a85b6..4cde60f 100644
--- a/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx
+++ b/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx
@@ -5,14 +5,13 @@ import { Drawer } from "@mantine/core";
 import DealEditorBody from "@/app/deals/drawers/DealEditorDrawer/components/DealEditorBody";
 import Header from "@/app/deals/drawers/DealEditorDrawer/components/Header";
 import { DrawerProps } from "@/drawers/types";
-import { DealsCrud } from "@/hooks/cruds/useDealsCrud";
 import useIsMobile from "@/hooks/utils/useIsMobile";
-import { DealSchema, ProjectSchema } from "@/lib/client";
+import { DealSchema } from "@/lib/client";
 
 type Props = {
-    project: ProjectSchema;
-    deal: DealSchema;
-    dealsCrud: DealsCrud;
+    value: DealSchema;
+    onChange: (deal: DealSchema) => void;
+    onDelete: (deal: DealSchema, onSuccess: () => void) => void;
 };
 
 const DealEditorDrawer: FC<DrawerProps<Props>> = ({
@@ -21,7 +20,7 @@ const DealEditorDrawer: FC<DrawerProps<Props>> = ({
     props,
 }) => {
     const isMobile = useIsMobile();
-    const [deal, setDeal] = useState(props.deal);
+    const [deal, setDeal] = useState(props.value);
 
     return (
         <Drawer
@@ -44,10 +43,12 @@ const DealEditorDrawer: FC<DrawerProps<Props>> = ({
                 },
             }}>
             <DealEditorBody
-                {...props}
-                deal={deal}
-                setDeal={setDeal}
-                onClose={onClose}
+                value={deal}
+                onChange={deal => {
+                    setDeal(deal);
+                    props.onChange(deal);
+                }}
+                onDelete={value => props.onDelete(value, onClose)}
             />
         </Drawer>
     );
diff --git a/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx b/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx
index 743ab75..985cc11 100644
--- a/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx
+++ b/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx
@@ -2,16 +2,13 @@ import React, { FC } from "react";
 import { IconCircleDotted, IconEdit } from "@tabler/icons-react";
 import { Tabs, Text } from "@mantine/core";
 import GeneralTab from "@/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab";
-import { DealsCrud } from "@/hooks/cruds/useDealsCrud";
-import { DealSchema, ProjectSchema } from "@/lib/client";
+import { DealSchema } from "@/lib/client";
 import styles from "../DealEditorDrawer.module.css";
 
 type Props = {
-    project: ProjectSchema;
-    dealsCrud: DealsCrud;
-    deal: DealSchema;
-    setDeal: React.Dispatch<React.SetStateAction<DealSchema>>;
-    onClose: () => void;
+    value: DealSchema;
+    onChange: (deal: DealSchema) => void;
+    onDelete: (deal: DealSchema) => void;
 };
 
 const DealEditorBody: FC<Props> = props => {
diff --git a/src/app/deals/drawers/DealEditorDrawer/index.ts b/src/app/deals/drawers/DealEditorDrawer/index.ts
index 906564b..b48fc3f 100644
--- a/src/app/deals/drawers/DealEditorDrawer/index.ts
+++ b/src/app/deals/drawers/DealEditorDrawer/index.ts
@@ -1,3 +1,3 @@
-import ProjectsEditorDrawer from "@/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer";
+import ProjectsMobileEditorDrawer from "@/app/deals/drawers/ProjectsEditorDrawer/ProjectsMobileEditorDrawer";
 
-export default ProjectsEditorDrawer;
+export default ProjectsMobileEditorDrawer;
diff --git a/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/Footer.tsx b/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/Footer.tsx
index 47bb369..a165483 100644
--- a/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/Footer.tsx
+++ b/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/Footer.tsx
@@ -2,10 +2,11 @@ import { FC } from "react";
 import { isEqual } from "lodash";
 import { Button, Group } from "@mantine/core";
 import { UseFormReturnType } from "@mantine/form";
+import { DealForm } from "@/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab";
 import { DealSchema } from "@/lib/client";
 
 type Props = {
-    form: UseFormReturnType<Partial<DealSchema>>;
+    form: UseFormReturnType<DealForm>;
     initialValues: Partial<DealSchema>;
     onDelete: () => void;
 };
diff --git a/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab.tsx b/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab.tsx
index 164710a..f585764 100644
--- a/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab.tsx
+++ b/src/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/GeneralTab.tsx
@@ -4,27 +4,23 @@ import { useForm } from "@mantine/form";
 import Footer from "@/app/deals/drawers/DealEditorDrawer/tabs/GeneralTab/Footer";
 import BoardSelect from "@/components/selects/BoardSelect/BoardSelect";
 import StatusSelect from "@/components/selects/StatusSelect/StatusSelect";
-import { DealsCrud } from "@/hooks/cruds/useDealsCrud";
-import { DealSchema, ProjectSchema } from "@/lib/client";
+import { BoardSchema, DealSchema, StatusSchema } from "@/lib/client";
 import { utcDateTimeToLocalString } from "@/utils/datetime";
 
 type Props = {
-    project: ProjectSchema;
-    dealsCrud: DealsCrud;
-    deal: DealSchema;
-    setDeal: React.Dispatch<React.SetStateAction<DealSchema>>;
-    onClose: () => void;
+    value: DealSchema;
+    onChange: (deal: DealSchema) => void;
+    onDelete: (deal: DealSchema) => void;
 };
 
-const GeneralTab: FC<Props> = ({
-    project,
-    deal,
-    setDeal,
-    dealsCrud,
-    onClose,
-}) => {
-    const form = useForm<Partial<DealSchema>>({
-        initialValues: deal,
+export type DealForm = Omit<DealSchema, "board" | "status"> & {
+    board?: BoardSchema | undefined;
+    status?: StatusSchema | undefined;
+};
+
+const GeneralTab: FC<Props> = ({ value, onDelete, onChange }) => {
+    const form = useForm<DealForm>({
+        initialValues: value,
         validate: {
             name: value => !value && "Введите название",
             board: value => !value && "Выберите доску",
@@ -32,20 +28,13 @@ const GeneralTab: FC<Props> = ({
         },
     });
 
-    const onSubmit = (values: Partial<DealSchema>) => {
-        dealsCrud.onUpdate(deal.id, {
+    const onSubmit = (values: DealForm) => {
+        form.setInitialValues(values);
+        onChange({
             ...values,
-            boardId: values.board?.id,
-            statusId: values.status?.id,
+            board: values.board!,
+            status: values.status!,
         });
-        setDeal(prev => ({
-            ...prev,
-            ...values,
-        }));
-    };
-
-    const onDelete = () => {
-        dealsCrud.onDelete(deal, onClose);
     };
 
     return (
@@ -55,7 +44,9 @@ const GeneralTab: FC<Props> = ({
                     label={"Название"}
                     {...form.getInputProps("name")}
                 />
-                <Text>Создано: {utcDateTimeToLocalString(deal.createdAt)}</Text>
+                <Text>
+                    Создано: {utcDateTimeToLocalString(value.createdAt)}
+                </Text>
                 <BoardSelect
                     label={"Доска"}
                     {...form.getInputProps("board")}
@@ -63,7 +54,7 @@ const GeneralTab: FC<Props> = ({
                         form.setFieldValue("board", board ?? undefined);
                         form.setFieldValue("status", undefined);
                     }}
-                    projectId={project?.id}
+                    projectId={value.board.projectId}
                 />
                 <StatusSelect
                     label={"Статус"}
@@ -72,8 +63,8 @@ const GeneralTab: FC<Props> = ({
                 />
                 <Footer
                     form={form}
-                    initialValues={deal}
-                    onDelete={onDelete}
+                    initialValues={value}
+                    onDelete={() => onDelete(value)}
                 />
             </Stack>
         </form>
diff --git a/src/app/deals/drawers/ProjectBoardsEditorDrawer/index.ts b/src/app/deals/drawers/ProjectBoardsEditorDrawer/index.ts
deleted file mode 100644
index 705c80f..0000000
--- a/src/app/deals/drawers/ProjectBoardsEditorDrawer/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ProjectBoardsEditorDrawer from "@/app/deals/drawers/ProjectBoardsEditorDrawer/ProjectBoardsEditorDrawer";
-
-export default ProjectBoardsEditorDrawer;
diff --git a/src/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer.module.css b/src/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer.module.css
similarity index 100%
rename from src/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer.module.css
rename to src/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer.module.css
diff --git a/src/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer.tsx b/src/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer.tsx
similarity index 56%
rename from src/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer.tsx
rename to src/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer.tsx
index d62c369..603100d 100644
--- a/src/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer.tsx
+++ b/src/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer.tsx
@@ -1,24 +1,25 @@
 "use client";
 
-import React, { FC } from "react";
+import React, { FC, useState } from "react";
 import { Drawer } from "@mantine/core";
-import ProjectEditorBody from "@/app/deals/drawers/SelectedProjectEditorDrawer/components/ProjectEditorBody";
+import ProjectEditorBody from "@/app/deals/drawers/ProjectEditorDrawer/components/ProjectEditorBody";
 import { DrawerProps } from "@/drawers/types";
-import { ProjectsCrud } from "@/hooks/cruds/useProjectsCrud";
 import useIsMobile from "@/hooks/utils/useIsMobile";
 import { ProjectSchema } from "@/lib/client";
 
 type Props = {
-    project: ProjectSchema;
-    projectsCrud: ProjectsCrud;
+    value: ProjectSchema;
+    onChange: (value: ProjectSchema) => void;
+    onDelete: (value: ProjectSchema, onSuccess: () => void) => void;
 };
 
-const SelectedProjectEditorDrawer: FC<DrawerProps<Props>> = ({
+const ProjectEditorDrawer: FC<DrawerProps<Props>> = ({
     opened,
     onClose,
     props,
 }) => {
     const isMobile = useIsMobile();
+    const [project, setProject] = useState(props.value);
 
     return (
         <Drawer
@@ -38,11 +39,15 @@ const SelectedProjectEditorDrawer: FC<DrawerProps<Props>> = ({
                 },
             }}>
             <ProjectEditorBody
-                {...props}
-                onClose={onClose}
+                value={project}
+                onChange={project => {
+                    setProject(project);
+                    props.onChange(project);
+                }}
+                onDelete={value => props.onDelete(value, onClose)}
             />
         </Drawer>
     );
 };
 
-export default SelectedProjectEditorDrawer;
+export default ProjectEditorDrawer;
diff --git a/src/app/deals/drawers/SelectedProjectEditorDrawer/components/ProjectEditorBody.tsx b/src/app/deals/drawers/ProjectEditorDrawer/components/ProjectEditorBody.tsx
similarity index 54%
rename from src/app/deals/drawers/SelectedProjectEditorDrawer/components/ProjectEditorBody.tsx
rename to src/app/deals/drawers/ProjectEditorDrawer/components/ProjectEditorBody.tsx
index ac29074..5864e50 100644
--- a/src/app/deals/drawers/SelectedProjectEditorDrawer/components/ProjectEditorBody.tsx
+++ b/src/app/deals/drawers/ProjectEditorDrawer/components/ProjectEditorBody.tsx
@@ -1,18 +1,17 @@
 import { FC } from "react";
 import { IconEdit } from "@tabler/icons-react";
 import { Tabs } from "@mantine/core";
-import GeneralTab from "@/app/deals/drawers/SelectedProjectEditorDrawer/components/GeneralTab";
-import { ProjectsCrud } from "@/hooks/cruds/useProjectsCrud";
+import GeneralTab from "@/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/GeneralTab";
 import { ProjectSchema } from "@/lib/client";
-import styles from "../SelectedProjectEditorDrawer.module.css";
+import styles from "../ProjectEditorDrawer.module.css";
 
 type Props = {
-    projectsCrud: ProjectsCrud;
-    project: ProjectSchema;
-    onClose: () => void;
+    value: ProjectSchema;
+    onChange: (value: ProjectSchema) => void;
+    onDelete: (value: ProjectSchema) => void;
 };
 
-const ProjectEditorBody: FC<Props> = ({ projectsCrud, project, onClose }) => {
+const ProjectEditorBody: FC<Props> = props => {
     return (
         <Tabs
             defaultValue="general"
@@ -25,11 +24,7 @@ const ProjectEditorBody: FC<Props> = ({ projectsCrud, project, onClose }) => {
                 </Tabs.Tab>
             </Tabs.List>
             <Tabs.Panel value="general">
-                <GeneralTab
-                    projectsCrud={projectsCrud}
-                    project={project}
-                    onClose={onClose}
-                />
+                <GeneralTab {...props} />
             </Tabs.Panel>
         </Tabs>
     );
diff --git a/src/app/deals/drawers/ProjectEditorDrawer/index.ts b/src/app/deals/drawers/ProjectEditorDrawer/index.ts
new file mode 100644
index 0000000..65fd2e2
--- /dev/null
+++ b/src/app/deals/drawers/ProjectEditorDrawer/index.ts
@@ -0,0 +1,3 @@
+import ProjectEditorDrawer from "@/app/deals/drawers/ProjectEditorDrawer/ProjectEditorDrawer";
+
+export default ProjectEditorDrawer;
diff --git a/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/Footer.tsx b/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/Footer.tsx
new file mode 100644
index 0000000..ee0b228
--- /dev/null
+++ b/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/Footer.tsx
@@ -0,0 +1,43 @@
+import { FC } from "react";
+import { isEqual } from "lodash";
+import { Button, Group } from "@mantine/core";
+import { UseFormReturnType } from "@mantine/form";
+import { ProjectSchema } from "@/lib/client";
+
+type Props = {
+    form: UseFormReturnType<ProjectSchema>;
+    initialValues: Partial<ProjectSchema>;
+    onDelete: () => void;
+};
+
+const Footer: FC<Props> = ({ form, initialValues, onDelete }) => {
+    return (
+        <Group
+            justify={"space-between"}
+            wrap={"nowrap"}>
+            <Group wrap={"nowrap"}>
+                <Button
+                    type={"submit"}
+                    disabled={isEqual(form.values, initialValues)}
+                    variant={"filled"}>
+                    Сохранить
+                </Button>
+                <Button
+                    type={"reset"}
+                    onClick={() => form.reset()}
+                    disabled={isEqual(form.values, initialValues)}
+                    variant={"default"}>
+                    Отменить
+                </Button>
+            </Group>
+            <Button
+                onClick={onDelete}
+                color={"red"}
+                variant={"outline"}>
+                Удалить
+            </Button>
+        </Group>
+    );
+};
+
+export default Footer;
diff --git a/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/GeneralTab.tsx b/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/GeneralTab.tsx
new file mode 100644
index 0000000..8e1201d
--- /dev/null
+++ b/src/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/GeneralTab.tsx
@@ -0,0 +1,43 @@
+import { FC } from "react";
+import { Stack, TextInput } from "@mantine/core";
+import { useForm } from "@mantine/form";
+import Footer from "@/app/deals/drawers/ProjectEditorDrawer/tabs/GeneralTab/Footer";
+import { ProjectSchema } from "@/lib/client";
+
+type Props = {
+    value: ProjectSchema;
+    onChange: (value: ProjectSchema) => void;
+    onDelete: (value: ProjectSchema) => void;
+};
+
+const GeneralTab: FC<Props> = ({ value, onChange, onDelete }) => {
+    const form = useForm<ProjectSchema>({
+        initialValues: value,
+        validate: {
+            name: value => !value && "Введите название",
+        },
+    });
+
+    const onSubmit = (values: ProjectSchema) => {
+        onChange(values);
+        form.setInitialValues(values);
+    };
+
+    return (
+        <form onSubmit={form.onSubmit(onSubmit)}>
+            <Stack p={"md"}>
+                <TextInput
+                    label={"Название"}
+                    {...form.getInputProps("name")}
+                />
+                <Footer
+                    form={form}
+                    initialValues={value}
+                    onDelete={() => onDelete(value)}
+                />
+            </Stack>
+        </form>
+    );
+};
+
+export default GeneralTab;
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/index.ts b/src/app/deals/drawers/ProjectsEditorDrawer/index.ts
deleted file mode 100644
index 906564b..0000000
--- a/src/app/deals/drawers/ProjectsEditorDrawer/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ProjectsEditorDrawer from "@/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer";
-
-export default ProjectsEditorDrawer;
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer.module.css b/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsEditorDrawer.module.css
similarity index 100%
rename from src/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer.module.css
rename to src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsEditorDrawer.module.css
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer.tsx b/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
similarity index 74%
rename from src/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer.tsx
rename to src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
index aa7ba1e..adca77a 100644
--- a/src/app/deals/drawers/ProjectsEditorDrawer/ProjectsEditorDrawer.tsx
+++ b/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
@@ -3,17 +3,18 @@
 import React, { FC } from "react";
 import { Center, Divider, Drawer, rem, Text } from "@mantine/core";
 import { ProjectsContextProvider } from "@/app/deals/contexts/ProjectsContext";
-import ProjectsDrawerBody from "@/app/deals/drawers/BoardStatusesEditorDrawer/components/ProjectsDrawerBody";
+import ProjectsDrawerBody from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/ProjectsDrawerBody";
 import { DrawerProps } from "@/drawers/types";
+import { ProjectSchema } from "@/lib/client";
 
 type Props = {
-    setSelectedProjectId: (projectId: number | null) => void;
+    onSelect: (project: ProjectSchema | null) => void;
 };
 
-const ProjectsEditorDrawer: FC<DrawerProps<Props>> = ({
+const ProjectsMobileEditorDrawer: FC<DrawerProps<Props>> = ({
     opened,
     onClose,
-    props: { setSelectedProjectId },
+    props: { onSelect },
 }) => {
     return (
         <Drawer
@@ -38,7 +39,7 @@ const ProjectsEditorDrawer: FC<DrawerProps<Props>> = ({
             <Divider />
             <ProjectsContextProvider>
                 <ProjectsDrawerBody
-                    setSelectedProjectId={setSelectedProjectId}
+                    onSelect={onSelect}
                     onClose={onClose}
                 />
             </ProjectsContextProvider>
@@ -46,4 +47,4 @@ const ProjectsEditorDrawer: FC<DrawerProps<Props>> = ({
     );
 };
 
-export default ProjectsEditorDrawer;
+export default ProjectsMobileEditorDrawer;
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/components/CreateProjectButton.tsx b/src/app/deals/drawers/ProjectsMobileEditorDrawer/components/CreateProjectButton.tsx
similarity index 100%
rename from src/app/deals/drawers/ProjectsEditorDrawer/components/CreateProjectButton.tsx
rename to src/app/deals/drawers/ProjectsMobileEditorDrawer/components/CreateProjectButton.tsx
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMenu.tsx b/src/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMenu.tsx
similarity index 100%
rename from src/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMenu.tsx
rename to src/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMenu.tsx
diff --git a/src/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMobile.tsx b/src/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMobile.tsx
similarity index 82%
rename from src/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMobile.tsx
rename to src/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMobile.tsx
index c8fddb1..fb5e9c4 100644
--- a/src/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMobile.tsx
+++ b/src/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMobile.tsx
@@ -2,21 +2,17 @@ import React, { FC } from "react";
 import { Box, Group, Text } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
-import ProjectMenu from "@/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMenu";
+import ProjectMenu from "@/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMenu";
 import { ProjectSchema } from "@/lib/client";
 import styles from "./../ProjectsEditorDrawer.module.css";
 
 type Props = {
     project: ProjectSchema;
-    setSelectedProjectId: (projectId: number | null) => void;
+    onSelect: (project: ProjectSchema | null) => void;
     closeDrawer: () => void;
 };
 
-const ProjectMobile: FC<Props> = ({
-    project,
-    setSelectedProjectId,
-    closeDrawer,
-}) => {
+const ProjectMobile: FC<Props> = ({ project, onSelect, closeDrawer }) => {
     const { projectsCrud } = useProjectsContext();
 
     const startEditing = () => {
@@ -32,7 +28,7 @@ const ProjectMobile: FC<Props> = ({
     };
 
     const onClick = () => {
-        setSelectedProjectId(project.id);
+        onSelect(project);
         closeDrawer();
     };
 
diff --git a/src/app/deals/drawers/ProjectsMobileEditorDrawer/index.ts b/src/app/deals/drawers/ProjectsMobileEditorDrawer/index.ts
new file mode 100644
index 0000000..9250f75
--- /dev/null
+++ b/src/app/deals/drawers/ProjectsMobileEditorDrawer/index.ts
@@ -0,0 +1,3 @@
+import ProjectsMobileEditorDrawer from "./ProjectsMobileEditorDrawer";
+
+export default ProjectsMobileEditorDrawer;
diff --git a/src/app/deals/drawers/SelectedProjectEditorDrawer/components/GeneralTab.tsx b/src/app/deals/drawers/SelectedProjectEditorDrawer/components/GeneralTab.tsx
deleted file mode 100644
index df51b3c..0000000
--- a/src/app/deals/drawers/SelectedProjectEditorDrawer/components/GeneralTab.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { FC, useState } from "react";
-import { isEqual } from "lodash";
-import { Button, Group, Stack, TextInput } from "@mantine/core";
-import { useForm } from "@mantine/form";
-import { ProjectsCrud } from "@/hooks/cruds/useProjectsCrud";
-import { ProjectSchema } from "@/lib/client";
-
-
-type Props = {
-    projectsCrud: ProjectsCrud;
-    project: ProjectSchema;
-    onClose: () => void;
-};
-
-const GeneralTab: FC<Props> = ({ project, projectsCrud, onClose }) => {
-    const [initialValues, setInitialValues] = useState(project);
-    const form = useForm<ProjectSchema>({
-        initialValues,
-        validate: {
-            name: value => !value && "Введите название",
-        },
-    });
-
-    const onSubmit = (values: ProjectSchema) => {
-        projectsCrud.onUpdate(project.id, values);
-        setInitialValues(values);
-    };
-
-    const onDelete = () => {
-        projectsCrud.onDelete(project, onClose);
-    };
-
-    return (
-        <form onSubmit={form.onSubmit(onSubmit)}>
-            <Stack p={"md"}>
-                <TextInput
-                    label={"Название"}
-                    {...form.getInputProps("name")}
-                />
-                <Group
-                    justify={"space-between"}
-                    wrap={"nowrap"}>
-                    <Group wrap={"nowrap"}>
-                        <Button
-                            type={"submit"}
-                            disabled={isEqual(form.values, initialValues)}
-                            variant={"filled"}>
-                            Сохранить
-                        </Button>
-                        <Button
-                            type={"reset"}
-                            onClick={() => form.reset()}
-                            disabled={isEqual(form.values, initialValues)}
-                            variant={"default"}>
-                            Отменить
-                        </Button>
-                    </Group>
-                    <Button
-                        onClick={onDelete}
-                        color={"red"}
-                        variant={"outline"}>
-                        Удалить
-                    </Button>
-                </Group>
-            </Stack>
-        </form>
-    );
-};
-
-export default GeneralTab;
diff --git a/src/app/deals/drawers/SelectedProjectEditorDrawer/index.ts b/src/app/deals/drawers/SelectedProjectEditorDrawer/index.ts
deleted file mode 100644
index b451989..0000000
--- a/src/app/deals/drawers/SelectedProjectEditorDrawer/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import SelectedProjectEditorDrawer from "@/app/deals/drawers/SelectedProjectEditorDrawer/SelectedProjectEditorDrawer";
-
-export default SelectedProjectEditorDrawer;
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/BoardStatusesEditorDrawer.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
similarity index 66%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/BoardStatusesEditorDrawer.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
index fa755e3..ca900aa 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/BoardStatusesEditorDrawer.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
@@ -2,8 +2,8 @@
 
 import React, { FC } from "react";
 import { Drawer, rem } from "@mantine/core";
-import StatusesDrawerBody from "@/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusesDrawerBody";
-import { BoardStatusesContextProvider } from "@/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext";
+import StatusesDrawerBody from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusesDrawerBody";
+import { StatusesMobileContextProvider } from "@/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext";
 import { DrawerProps } from "@/drawers/types";
 import { BoardSchema } from "@/lib/client";
 
@@ -11,7 +11,7 @@ type Props = {
     board: BoardSchema;
 };
 
-const BoardStatusesEditorDrawer: FC<DrawerProps<Props>> = ({
+const StatusesMobileEditorDrawer: FC<DrawerProps<Props>> = ({
     opened,
     onClose,
     props: { board },
@@ -33,11 +33,11 @@ const BoardStatusesEditorDrawer: FC<DrawerProps<Props>> = ({
                     gap: rem(10),
                 },
             }}>
-            <BoardStatusesContextProvider board={board}>
+            <StatusesMobileContextProvider board={board}>
                 <StatusesDrawerBody onClose={onClose} />
-            </BoardStatusesContextProvider>
+            </StatusesMobileContextProvider>
         </Drawer>
     );
 };
 
-export default BoardStatusesEditorDrawer;
+export default StatusesMobileEditorDrawer;
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/CreateStatusButton.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/CreateStatusButton.tsx
similarity index 82%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/components/CreateStatusButton.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/components/CreateStatusButton.tsx
index 2f66201..00df9fe 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/CreateStatusButton.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/CreateStatusButton.tsx
@@ -2,10 +2,10 @@ import { FC } from "react";
 import { IconPlus } from "@tabler/icons-react";
 import { Box, Group, Text } from "@mantine/core";
 import { modals } from "@mantine/modals";
-import { useBoardStatusesContext } from "@/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext";
+import { useStatusesMobileContext } from "@/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext";
 
 const CreateStatusButton: FC = () => {
-    const { statusesCrud } = useBoardStatusesContext();
+    const { statusesCrud } = useStatusesMobileContext();
 
     const onStartCreating = () => {
         modals.openContextModal({
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/ProjectsDrawerBody.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/ProjectsDrawerBody.tsx
similarity index 60%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/components/ProjectsDrawerBody.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/components/ProjectsDrawerBody.tsx
index 6c3b594..a8a9f76 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/ProjectsDrawerBody.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/ProjectsDrawerBody.tsx
@@ -1,15 +1,16 @@
 import React, { FC } from "react";
 import { Stack } from "@mantine/core";
 import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
-import CreateProjectButton from "@/app/deals/drawers/ProjectsEditorDrawer/components/CreateProjectButton";
-import ProjectMobile from "@/app/deals/drawers/ProjectsEditorDrawer/components/ProjectMobile";
+import CreateProjectButton from "@/app/deals/drawers/ProjectsMobileEditorDrawer/components/CreateProjectButton";
+import ProjectMobile from "@/app/deals/drawers/ProjectsMobileEditorDrawer/components/ProjectMobile";
+import { ProjectSchema } from "@/lib/client";
 
 type Props = {
-    setSelectedProjectId: (projectId: number | null) => void;
+    onSelect: (project: ProjectSchema | null) => void;
     onClose: () => void;
 };
 
-const ProjectsDrawerBody: FC<Props> = ({ setSelectedProjectId, onClose }) => {
+const ProjectsDrawerBody: FC<Props> = ({ onSelect, onClose }) => {
     const { projects } = useProjectsContext();
 
     return (
@@ -19,7 +20,7 @@ const ProjectsDrawerBody: FC<Props> = ({ setSelectedProjectId, onClose }) => {
                     <ProjectMobile
                         key={index}
                         project={project}
-                        setSelectedProjectId={setSelectedProjectId}
+                        onSelect={onSelect}
                         closeDrawer={onClose}
                     />
                 ))}
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusMobile.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusMobile.tsx
similarity index 88%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusMobile.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusMobile.tsx
index 61d5308..354e1d3 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusMobile.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusMobile.tsx
@@ -2,7 +2,7 @@ import React, { FC } from "react";
 import { Box, Group, Text } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import StatusMenu from "@/app/deals/components/shared/StatusMenu/StatusMenu";
-import { useBoardStatusesContext } from "@/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext";
+import { useStatusesMobileContext } from "@/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext";
 import { BoardSchema, StatusSchema } from "@/lib/client";
 
 type Props = {
@@ -11,7 +11,7 @@ type Props = {
 };
 
 const StatusMobile: FC<Props> = ({ status, board }) => {
-    const { statusesCrud } = useBoardStatusesContext();
+    const { statusesCrud } = useStatusesMobileContext();
 
     const startEditing = () => {
         modals.openContextModal({
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusesDrawerBody.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusesDrawerBody.tsx
similarity index 81%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusesDrawerBody.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusesDrawerBody.tsx
index 064c703..c291362 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusesDrawerBody.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusesDrawerBody.tsx
@@ -1,9 +1,9 @@
 import React, { FC, ReactNode } from "react";
 import { IconChevronLeft, IconGripVertical } from "@tabler/icons-react";
 import { Box, Center, Divider, Group, Text } from "@mantine/core";
-import CreateStatusButton from "@/app/deals/drawers/BoardStatusesEditorDrawer/components/CreateStatusButton";
-import StatusMobile from "@/app/deals/drawers/BoardStatusesEditorDrawer/components/StatusMobile";
-import { useBoardStatusesContext } from "@/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext";
+import CreateStatusButton from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/CreateStatusButton";
+import StatusMobile from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusMobile";
+import { useStatusesMobileContext } from "@/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext";
 import SortableDnd from "@/components/dnd/SortableDnd";
 import { StatusSchema } from "@/lib/client";
 
@@ -12,7 +12,7 @@ type Props = {
 };
 
 const StatusesDrawerBody: FC<Props> = ({ onClose }) => {
-    const { statusesCrud, board, statuses } = useBoardStatusesContext();
+    const { statusesCrud, board, statuses } = useStatusesMobileContext();
 
     const renderDraggable = () => (
         <Box p={"xs"}>
diff --git a/src/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext.tsx
similarity index 94%
rename from src/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext.tsx
rename to src/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext.tsx
index d3edd0a..e61ed4c 100644
--- a/src/app/deals/drawers/BoardStatusesEditorDrawer/contexts/BoardStatusesContext.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext.tsx
@@ -44,7 +44,7 @@ const useBoardStatusesContextState = ({
     };
 };
 
-export const [BoardStatusesContextProvider, useBoardStatusesContext] =
+export const [StatusesMobileContextProvider, useStatusesMobileContext] =
     makeContext<BoardStatusesContextState, Props>(
         useBoardStatusesContextState,
         "BoardStatuses"
diff --git a/src/app/deals/drawers/StatusesMobileEditorDrawer/index.ts b/src/app/deals/drawers/StatusesMobileEditorDrawer/index.ts
new file mode 100644
index 0000000..5a36c40
--- /dev/null
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/index.ts
@@ -0,0 +1,3 @@
+import StatusesMobileEditorDrawer from "@/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer";
+
+export default StatusesMobileEditorDrawer;
diff --git a/src/components/ui/InPlaceInput/InPlaceInputDesktop.tsx b/src/components/ui/InPlaceInput/InPlaceInputDesktop.tsx
index c3eb5f6..0a58ac2 100644
--- a/src/components/ui/InPlaceInput/InPlaceInputDesktop.tsx
+++ b/src/components/ui/InPlaceInput/InPlaceInputDesktop.tsx
@@ -49,7 +49,7 @@ const InPlaceInputDesktop: FC<Props> = ({
     };
 
     const onCancelCreating = () => {
-        setLocalValue(localValue);
+        setLocalValue("");
         setIsWriting(false);
     };
 
@@ -58,6 +58,7 @@ const InPlaceInputDesktop: FC<Props> = ({
         if (val) {
             onChange(val);
         }
+        setLocalValue("");
         setIsWriting(false);
     };
 
diff --git a/src/drawers/drawersRegistry.tsx b/src/drawers/drawersRegistry.tsx
index f1c9c40..fb8aa0c 100644
--- a/src/drawers/drawersRegistry.tsx
+++ b/src/drawers/drawersRegistry.tsx
@@ -1,15 +1,15 @@
-import BoardStatusesEditorDrawer from "@/app/deals/drawers/BoardStatusesEditorDrawer";
+import BoardsMobileEditorDrawer from "@/app/deals/drawers/BoardsMobileEditorDrawer";
+import StatusesMobileEditorDrawer from "../app/deals/drawers/StatusesMobileEditorDrawer";
 import DealEditorDrawer from "@/app/deals/drawers/DealEditorDrawer/DealEditorDrawer";
-import ProjectBoardsEditorDrawer from "@/app/deals/drawers/ProjectBoardsEditorDrawer";
-import ProjectsEditorDrawer from "@/app/deals/drawers/ProjectsEditorDrawer";
-import SelectedProjectEditorDrawer from "@/app/deals/drawers/SelectedProjectEditorDrawer";
+import ProjectEditorDrawer from "@/app/deals/drawers/ProjectEditorDrawer";
+import ProjectsMobileEditorDrawer from "@/app/deals/drawers/ProjectsMobileEditorDrawer";
 
 const drawerRegistry = {
-    projectsEditorDrawer: ProjectsEditorDrawer,
-    boardStatusesEditorDrawer: BoardStatusesEditorDrawer,
-    projectBoardsEditorDrawer: ProjectBoardsEditorDrawer,
+    projectsMobileEditorDrawer: ProjectsMobileEditorDrawer,
+    statusesMobileEditorDrawer: StatusesMobileEditorDrawer,
+    boardsMobileEditorDrawer: BoardsMobileEditorDrawer,
     dealEditorDrawer: DealEditorDrawer,
-    selectedProjectEditorDrawer: SelectedProjectEditorDrawer,
+    projectEditorDrawer: ProjectEditorDrawer,
 };
 
 export default drawerRegistry;
diff --git a/src/lib/client/types.gen.ts b/src/lib/client/types.gen.ts
index 8a0509e..68634b4 100644
--- a/src/lib/client/types.gen.ts
+++ b/src/lib/client/types.gen.ts
@@ -16,6 +16,10 @@ export type BoardSchema = {
      * Lexorank
      */
     lexorank: string;
+    /**
+     * Projectid
+     */
+    projectId: number;
 };
 
 /**
diff --git a/src/lib/client/zod.gen.ts b/src/lib/client/zod.gen.ts
index eb98fdc..1015126 100644
--- a/src/lib/client/zod.gen.ts
+++ b/src/lib/client/zod.gen.ts
@@ -9,6 +9,7 @@ export const zBoardSchema = z.object({
     id: z.int(),
     name: z.string(),
     lexorank: z.string(),
+    projectId: z.int(),
 });
 
 /**