From 6dc710be0a98f69252877e3f7dfee6be8e519c32 Mon Sep 17 00:00:00 2001
From: Elyor Djalilov <edjalilov.dev@gmail.com>
Date: Mon, 30 Jan 2023 17:56:07 +0500
Subject: [PATCH] Fix Bug - Files. Create folder with dialog

---
 .../client/src/components/GlobalEvents/CreateEvent.js |  3 +++
 .../components/GlobalEvents/sub-components/Dialog.js  | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/GlobalEvents/CreateEvent.js b/packages/client/src/components/GlobalEvents/CreateEvent.js
index d44d5c7514..ab3cdbb167 100644
--- a/packages/client/src/components/GlobalEvents/CreateEvent.js
+++ b/packages/client/src/components/GlobalEvents/CreateEvent.js
@@ -75,6 +75,8 @@ const CreateEvent = ({
 
     setHeaderTitle(defaultName);
 
+    if (!extension) return setEventDialogVisible(true);
+
     if (!createWithoutDialog) {
       setEventDialogVisible(true);
     } else {
@@ -272,6 +274,7 @@ const CreateEvent = ({
       onCancel={onCancel}
       onClose={onCloseAction}
       isCreateDialog={true}
+      extension={extension}
     />
   );
 };
diff --git a/packages/client/src/components/GlobalEvents/sub-components/Dialog.js b/packages/client/src/components/GlobalEvents/sub-components/Dialog.js
index 3e136155ae..422a7b18a9 100644
--- a/packages/client/src/components/GlobalEvents/sub-components/Dialog.js
+++ b/packages/client/src/components/GlobalEvents/sub-components/Dialog.js
@@ -24,6 +24,7 @@ const Dialog = ({
   isCreateDialog,
   createWithoutDialog,
   setCreateWithoutDialog,
+  extension,
 }) => {
   const [value, setValue] = useState("");
   const [isDisabled, setIsDisabled] = useState(false);
@@ -86,16 +87,18 @@ const Dialog = ({
   );
 
   const onCancelAction = useCallback((e) => {
+    if (isChecked) {
+      setCreateWithoutDialog(false);
+    }
     onCancel && onCancel(e);
-    setCreateWithoutDialog(false);
   }, []);
 
   const onCloseAction = useCallback(
     (e) => {
-      if (!isDisabled) {
-        onClose && onClose(e);
+      if (!isDisabled && isChecked) {
         setCreateWithoutDialog(false);
       }
+      onClose && onClose(e);
     },
     [isDisabled]
   );
@@ -125,7 +128,7 @@ const Dialog = ({
           onFocus={onFocus}
           isDisabled={isDisabled}
         />
-        {isCreateDialog && (
+        {isCreateDialog && extension && (
           <Box displayProp="flex" alignItems="center" paddingProp="16px 0 0">
             <Checkbox
               label={t("Common:DontAskAgain")}