diff --git a/packages/webapp/src/components/Dashboard/Dashboard.tsx b/packages/webapp/src/components/Dashboard/Dashboard.tsx
index 8371e0fba..2637128cf 100644
--- a/packages/webapp/src/components/Dashboard/Dashboard.tsx
+++ b/packages/webapp/src/components/Dashboard/Dashboard.tsx
@@ -14,19 +14,16 @@ import GlobalHotkeys from './GlobalHotkeys';
import DashboardProvider from './DashboardProvider';
import DrawersContainer from '@/components/DrawersContainer';
import AlertsContainer from '@/containers/AlertsContainer';
-import EnsureSubscriptionIsActive from '../Guards/EnsureSubscriptionIsActive';
/**
* Dashboard preferences.
*/
function DashboardPreferences() {
return (
-
-
-
-
-
-
+
+
+
+
);
}
diff --git a/packages/webapp/src/components/Dashboard/DashboardBoot.tsx b/packages/webapp/src/components/Dashboard/DashboardBoot.tsx
index a3316a7f5..2389cc4a7 100644
--- a/packages/webapp/src/components/Dashboard/DashboardBoot.tsx
+++ b/packages/webapp/src/components/Dashboard/DashboardBoot.tsx
@@ -7,26 +7,20 @@ import {
} from '@/hooks/query';
import { useSplashLoading } from '@/hooks/state';
import { useWatch, useWatchImmediate, useWhen } from '@/hooks';
-import { useSubscription } from '@/hooks/state';
import { setCookie, getCookie } from '@/utils';
/**
* Dashboard meta async booting.
- * - Fetches the dashboard meta only if the organization subscribe is active.
- * - Once the dashboard meta query is loading display dashboard splash screen.
+ * - Fetches the dashboard meta in booting state.
+ * - Once the dashboard meta query started loading display dashboard splash screen.
*/
export function useDashboardMetaBoot() {
- const { isSubscriptionActive } = useSubscription();
-
const {
data: dashboardMeta,
isLoading: isDashboardMetaLoading,
isSuccess: isDashboardMetaSuccess,
} = useDashboardMeta({
keepPreviousData: true,
-
- // Avoid run the query if the organization subscription is not active.
- enabled: isSubscriptionActive,
});
const [startLoading, stopLoading] = useSplashLoading();
diff --git a/packages/webapp/src/components/Dashboard/DashboardBreadcrumbs.tsx b/packages/webapp/src/components/Dashboard/DashboardBreadcrumbs.tsx
index 38537b2a4..d04144e8e 100644
--- a/packages/webapp/src/components/Dashboard/DashboardBreadcrumbs.tsx
+++ b/packages/webapp/src/components/Dashboard/DashboardBreadcrumbs.tsx
@@ -1,5 +1,6 @@
// @ts-nocheck
import React from 'react';
+import { useHistory } from 'react-router-dom';
import {
CollapsibleList,
MenuItem,
@@ -7,29 +8,29 @@ import {
Boundary,
} from '@blueprintjs/core';
import withBreadcrumbs from 'react-router-breadcrumbs-hoc';
-import { getDashboardRoutes } from '@/routes/dashboard';
-import { useHistory } from 'react-router-dom';
-function DashboardBreadcrumbs({ breadcrumbs }){
+function DashboardBreadcrumbs({ breadcrumbs }) {
const history = useHistory();
- return(
+ return (
}
- collapseFrom={Boundary.START}
- visibleItemCount={0}>
- {
- breadcrumbs.map(({ breadcrumb,match })=>{
- return (