From a5327d00f3631cddcc23b3db7d682385dad7f277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczyk?= Date: Tue, 8 Mar 2022 09:37:24 +0100 Subject: [PATCH] style(dashboard-v2): improve code readability --- .../src/components/CurrentUsage/CurrentUsage.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/dashboard-v2/src/components/CurrentUsage/CurrentUsage.js b/packages/dashboard-v2/src/components/CurrentUsage/CurrentUsage.js index f6e6f635..44be79ed 100644 --- a/packages/dashboard-v2/src/components/CurrentUsage/CurrentUsage.js +++ b/packages/dashboard-v2/src/components/CurrentUsage/CurrentUsage.js @@ -13,16 +13,20 @@ import { UsageGraph } from "./UsageGraph"; const useUsageData = () => { const { user } = useUser(); const { activePlan, error } = useActivePlan(user); - const [loading, setLoading] = useState(true); const { data: stats, error: statsError } = useSWR("user/stats"); + + const [loading, setLoading] = useState(true); const [usage, setUsage] = useState({}); + const hasError = error || statsError; + const hasData = activePlan && stats; + useEffect(() => { - if ((activePlan && stats) || error || statsError) { + if (hasData || hasError) { setLoading(false); } - if (activePlan && stats && !error && !statsError) { + if (hasData && !hasError) { setUsage({ filesUsed: stats?.numUploads, filesLimit: activePlan?.limits?.maxNumberUploads, @@ -30,7 +34,7 @@ const useUsageData = () => { storageLimit: activePlan?.limits?.storageLimit, }); } - }, [activePlan, stats, error, statsError]); + }, [hasData, hasError, stats, activePlan]); return { error: error || statsError,