From db3a7e9b33efde4f09c72e65b838be03ece6badc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=83=D0=BB?=
 <rasul.sahibjanli@gmail.com>
Date: Fri, 2 Aug 2024 19:41:38 +0300
Subject: [PATCH 1/4] feat: made modals load async

---
 src/components/App/index.tsx             | 32 ++++++++++------------
 src/components/ModalsContainer/index.tsx | 35 ++++++++++++++----------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 4bb79f001..cd9cdf982 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -66,7 +66,7 @@ export const App = () => {
 
   const setTeachMeAnswer = useTeachStore((s) => s.setTeachMeAnswer)
 
-  const { fetchData, setCategoryFilter, setAbortRequests, addNewNode, splashDataLoading } = useDataStore((s) => s)
+  const { fetchData, setCategoryFilter, setAbortRequests, addNewNode } = useDataStore((s) => s)
 
   const { setAiSummaryAnswer, getKeyExist, aiRefId } = useAiSummaryStore((s) => s)
 
@@ -229,22 +229,20 @@ export const App = () => {
       <Leva hidden={!isDevelopment} />
 
       <Suspense fallback={<div>Loading...</div>}>
-        {!splashDataLoading ? (
-          <Wrapper direction="row">
-            <FormProvider {...form}>
-              <LazyMainToolbar />
-              <LazySideBar />
-              <LazyUniverse />
-              <Overlay />
-              <AppBar />
-              <Version>v{version}</Version>
-              <ActionsToolbar />
-            </FormProvider>
-
-            <ModalsContainer />
-            <Toasts />
-          </Wrapper>
-        ) : null}
+        <Wrapper direction="row">
+          <FormProvider {...form}>
+            <LazyMainToolbar />
+            <LazySideBar />
+            <LazyUniverse />
+            <Overlay />
+            <AppBar />
+            <Version>v{version}</Version>
+            <ActionsToolbar />
+          </FormProvider>
+
+          <ModalsContainer />
+          <Toasts />
+        </Wrapper>
       </Suspense>
     </>
   )
diff --git a/src/components/ModalsContainer/index.tsx b/src/components/ModalsContainer/index.tsx
index 558eb60e4..b77fb9705 100644
--- a/src/components/ModalsContainer/index.tsx
+++ b/src/components/ModalsContainer/index.tsx
@@ -1,4 +1,5 @@
 import { lazy } from 'react'
+import { useSomeModalIsOpen } from '~/stores/useModalStore'
 
 const LazySettingsModal = lazy(() =>
   import('../SettingsModal').then(({ SettingsModal }) => ({ default: SettingsModal })),
@@ -42,18 +43,22 @@ const LazyUserFeedBackModal = lazy(() =>
   import('./UserFeedBackModal').then(({ UserFeedBackModal }) => ({ default: UserFeedBackModal })),
 )
 
-export const ModalsContainer = () => (
-  <>
-    <LazyAddItemModal />
-    <LazyAddContentModal />
-    <LazySettingsModal />
-    <LazyEditNodeNameModal />
-    <LazyRemoveNodeModal />
-    <LazySourcesTableModal />
-    <LazyAddNodeEdgeModal />
-    <LazyChangeNodeTypeModal />
-    <LazyBlueprintModal />
-    <LazyMergeNodeModal />
-    <LazyUserFeedBackModal />
-  </>
-)
+export const ModalsContainer = () => {
+  const someModalIsOpen = useSomeModalIsOpen()
+
+  return someModalIsOpen ? (
+    <>
+      <LazyAddItemModal />
+      <LazyAddContentModal />
+      <LazySettingsModal />
+      <LazyEditNodeNameModal />
+      <LazyRemoveNodeModal />
+      <LazySourcesTableModal />
+      <LazyAddNodeEdgeModal />
+      <LazyChangeNodeTypeModal />
+      <LazyBlueprintModal />
+      <LazyMergeNodeModal />
+      <LazyUserFeedBackModal />
+    </>
+  ) : null
+}

From 713a674c2b5fc8d14ba1ca5f3937f724be236783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=83=D0=BB?=
 <rasul.sahibjanli@gmail.com>
Date: Sat, 3 Aug 2024 12:23:18 +0300
Subject: [PATCH 2/4] feat: fix for docker-compose

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b0fd64627..243073cdc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
           command: |
             export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}"
             echo $TWITTER_BEARER
-            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/navfiber.yml --project-dir ./stack up -d;
+            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/navfiber.yml --project-directory ./stack up -d;
             sleep 240;
             docker ps
             docker logs meme.sphinx

From a4b9aec87a9f1c6a7844302a91575cd16b1ad637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=83=D0=BB?=
 <rasul.sahibjanli@gmail.com>
Date: Sat, 3 Aug 2024 12:45:05 +0300
Subject: [PATCH 3/4] feat: fix for docker-compose

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 243073cdc..0f55e65ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
           command: |
             export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}"
             echo $TWITTER_BEARER
-            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/navfiber.yml --project-directory ./stack up -d;
+            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml --project-directory ./stack up -d;
             sleep 240;
             docker ps
             docker logs meme.sphinx

From f3c9332f3515b0a50f2f976c1080cfcf25ff0bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=83=D0=BB?=
 <rasul.sahibjanli@gmail.com>
Date: Sat, 3 Aug 2024 18:35:56 +0300
Subject: [PATCH 4/4] feat: test cypress

---
 src/components/ModalsContainer/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ModalsContainer/index.tsx b/src/components/ModalsContainer/index.tsx
index b77fb9705..35749dab7 100644
--- a/src/components/ModalsContainer/index.tsx
+++ b/src/components/ModalsContainer/index.tsx
@@ -46,7 +46,7 @@ const LazyUserFeedBackModal = lazy(() =>
 export const ModalsContainer = () => {
   const someModalIsOpen = useSomeModalIsOpen()
 
-  return someModalIsOpen ? (
+  return someModalIsOpen || true ? (
     <>
       <LazyAddItemModal />
       <LazyAddContentModal />