From 8b28d6894f0ca208676df04e9f4b573997cea480 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sat, 27 Nov 2021 17:53:54 +0200
Subject: [PATCH] feat: avoid display any dashboard before boot complete
 loading.

---
 src/components/Dashboard/DashboardBoot.js     |  5 +++--
 src/components/Dashboard/DashboardProvider.js | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/Dashboard/DashboardBoot.js b/src/components/Dashboard/DashboardBoot.js
index 095a972cc..6e3d967fb 100644
--- a/src/components/Dashboard/DashboardBoot.js
+++ b/src/components/Dashboard/DashboardBoot.js
@@ -16,8 +16,9 @@ export function useDashboardMetaBoot() {
     data: dashboardMeta,
     isLoading: isDashboardMetaLoading,
     isSuccess: isDashboardMetaSuccess,
-  } = useDashboardMeta();
-
+  } = useDashboardMeta({
+    keepPreviousData: true,
+  });
   const [startLoading, stopLoading] = useSplashLoading();
 
   useWatchImmediate((value) => {
diff --git a/src/components/Dashboard/DashboardProvider.js b/src/components/Dashboard/DashboardProvider.js
index b72160cf4..68c8e5654 100644
--- a/src/components/Dashboard/DashboardProvider.js
+++ b/src/components/Dashboard/DashboardProvider.js
@@ -8,9 +8,9 @@ import { useDashboardBoot } from './DashboardBoot';
 export default function DashboardProvider({ children }) {
   const { isLoading } = useDashboardBoot();
 
-  return (
-    <DashboardAbilityProvider>
-      {isLoading ? null : children}
-    </DashboardAbilityProvider>
-  );
+  // Avoid display any dashboard component before complete booting.
+  if (isLoading) {
+    return null;
+  }
+  return <DashboardAbilityProvider>{children}</DashboardAbilityProvider>;
 }